Clang-format of source files

25 files changed, 9215 insertions, 10033 deletions

diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c
index 66997cb..5b617cc 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()
  *
@@ -103,57 +100,56 @@ 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)
 {
-    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 */
+    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, sanity check it */
-    if(H5P_DEFAULT != dxpl_id)
-        if(TRUE != H5Pisa_class(dxpl_id, H5P_DATASET_XFER))
+    if (H5P_DEFAULT != dxpl_id)
+        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,
@@ -161,99 +157,98 @@ H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis, size_t extension,
      */
     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 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 9847cae..7cd36b9 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -1,25 +1,24 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* 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 "H5DSprivate.h"
 #include "H5LTprivate.h"
 #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
@@ -41,51 +40,48 @@ static hid_t H5DS_get_REFLIST_type(void);
 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
  *
@@ -110,33 +106,33 @@ H5DSset_scale(hid_t dsid, const char *dimname)
 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;
@@ -146,20 +142,20 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
         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 */
 
@@ -173,21 +169,20 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
         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)
@@ -206,14 +201,14 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
         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;
@@ -223,57 +218,56 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
         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);
@@ -281,218 +275,217 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
     }
 
     /*-------------------------------------------------------------------------
-    * 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;
@@ -502,15 +495,15 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
     } /* 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;
     }
 
@@ -518,17 +511,19 @@ H5DSattach_scale(hid_t did, hid_t dsid, unsigned int idx)
 
     /* 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;
 }
 
@@ -559,68 +554,67 @@ out:
 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;
@@ -641,58 +635,56 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
         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 */
@@ -700,12 +692,12 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
                 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
@@ -716,10 +708,10 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
 
                     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;
                     }
@@ -728,108 +720,107 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
                     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)
@@ -838,44 +829,43 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
         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 */
 
@@ -892,29 +882,30 @@ H5DSdetach_scale(hid_t did, hid_t dsid, unsigned int idx)
 
     /* 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;
-
 }
 
 /*-------------------------------------------------------------------------
@@ -942,52 +933,52 @@ out:
 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 */
 
@@ -1001,16 +992,16 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
         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 */
@@ -1018,32 +1009,31 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
         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 */
@@ -1051,8 +1041,7 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
             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];
 
@@ -1061,30 +1050,28 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
                 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;
@@ -1099,39 +1086,38 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
     } /* 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;
@@ -1140,46 +1126,43 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
             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)
@@ -1202,18 +1185,20 @@ H5DSis_attached(hid_t did, hid_t dsid, unsigned int idx)
 
     /* 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;
     }
@@ -1260,42 +1245,40 @@ out:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx,
-    H5DS_iterate_t visitor, void *visitor_data )
+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;
     }
 
@@ -1304,70 +1287,67 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx,
         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 */
@@ -1382,10 +1362,10 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx,
                     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;
@@ -1401,15 +1381,17 @@ H5DSiterate_scales(hid_t did, unsigned int dim, int *ds_idx,
     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;
 }
@@ -1430,25 +1412,25 @@ out:
 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;
 
     HDmemset(&u, 0, sizeof(u));
 
     /*-------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
@@ -1459,7 +1441,7 @@ 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;
 
@@ -1471,25 +1453,24 @@ 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 */
@@ -1507,12 +1488,12 @@ 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 */
@@ -1529,20 +1510,18 @@ 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;
@@ -1551,7 +1530,7 @@ 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;
@@ -1575,8 +1554,7 @@ 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]);
         }
@@ -1586,8 +1564,7 @@ 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;
         }
@@ -1598,13 +1575,11 @@ 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]);
         }
@@ -1615,7 +1590,8 @@ out:
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
-    }H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
@@ -1640,20 +1616,20 @@ 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;
@@ -1661,7 +1637,7 @@ 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;
 
@@ -1673,41 +1649,39 @@ 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;
@@ -1717,27 +1691,23 @@ 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]);
     }
@@ -1747,21 +1717,18 @@ 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]);
         }
@@ -1772,7 +1739,8 @@ out:
         H5Sclose(sid);
         H5Aclose(aid);
         H5Tclose(tid);
-    }H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
@@ -1803,26 +1771,26 @@ H5DSget_scale_name(hid_t did, char *name, size_t size)
     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)
@@ -1832,43 +1800,43 @@ H5DSget_scale_name(hid_t did, char *name, size_t size)
         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 */
@@ -1885,11 +1853,13 @@ H5DSget_scale_name(hid_t did, char *name, size_t size)
 
     /* 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;
@@ -1908,99 +1878,100 @@ out:
  *
  *-------------------------------------------------------------------------
  */
-htri_t H5DSis_scale(hid_t did)
+htri_t
+H5DSis_scale(hid_t did)
 {
-    hid_t      tid = -1;     /* attribute type ID */
-    hid_t      aid = -1;     /* attribute ID */
-    herr_t     attr_class;   /* has the "CLASS" attribute */
-    htri_t     is_ds = -1;   /* set to "not a dimension scale" */
-    H5I_type_t it;           /* type of identifier */
-    char       *buf = NULL;  /* buffer to read name of attribute */
+    hid_t       tid = -1;    /* attribute type ID */
+    hid_t       aid = -1;    /* attribute ID */
+    herr_t      attr_class;  /* has the "CLASS" attribute */
+    htri_t      is_ds = -1;  /* set to "not a dimension scale" */
+    H5I_type_t  it;          /* type of identifier */
+    char *      buf = NULL;  /* buffer to read name of attribute */
     size_t      string_size; /* size of storage for the attribute */
     H5T_class_t type_class;
     H5T_str_t   strpad;
 
     /*------------------------------------------------------------------------
-    * parameter checking
-    *-------------------------------------------------------------------------
-    */
+     * parameter checking
+     *-------------------------------------------------------------------------
+     */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         goto out;
 
-    if(H5I_DATASET != it)
+    if (H5I_DATASET != it)
         goto out;
 
     /* try to find the attribute "CLASS" on the dataset */
-    if((attr_class = H5LT_find_attribute(did, "CLASS")) < 0)
+    if ((attr_class = H5LT_find_attribute(did, "CLASS")) < 0)
         goto out;
 
-    if(attr_class == 0) {
+    if (attr_class == 0) {
         is_ds = 0;
         goto out;
     }
-    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; 
+        /* check to make sure attribute is a string;
            if not, then it is not dimension scale  */
-        if((type_class = H5Tget_class(tid)) < 0)
+        if ((type_class = H5Tget_class(tid)) < 0)
             goto out;
-        if(H5T_STRING != type_class) {
+        if (H5T_STRING != type_class) {
             is_ds = 0;
             goto out;
         }
-        /* check to make sure string is null-terminated; 
+        /* check to make sure string is null-terminated;
            if not, then it is not dimension scale */
-        if((strpad = H5Tget_strpad(tid)) < 0 )
+        if ((strpad = H5Tget_strpad(tid)) < 0)
             goto out;
-        if(H5T_STR_NULLTERM != strpad) {
+        if (H5T_STR_NULLTERM != strpad) {
             is_ds = 0;
             goto out;
         }
 
-        /* According to Spec string is ASCII and its size should be 16 to hold 
+        /* According to Spec string is ASCII and its size should be 16 to hold
            "DIMENSION_SCALE" string */
-        if((string_size = H5Tget_size(tid)) == 0)
-             goto out;
-        if(string_size != 16) {
-            is_ds = 0; 
+        if ((string_size = H5Tget_size(tid)) == 0)
+            goto out;
+        if (string_size != 16) {
+            is_ds = 0;
             goto out;
         }
 
-        buf = (char*)HDmalloc((size_t)string_size * sizeof(char));
-        if(buf == NULL)
+        buf = (char *)HDmalloc((size_t)string_size * sizeof(char));
+        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;
 
         HDfree(buf);
 
-        if(H5Tclose(tid) < 0)
+        if (H5Tclose(tid) < 0)
             goto out;
 
         if (H5Aclose(aid) < 0)
             goto out;
     }
 out:
-    if(is_ds < 0) {
+    if (is_ds < 0) {
         HDfree(buf);
-        H5E_BEGIN_TRY {
+        H5E_BEGIN_TRY
+        {
             H5Aclose(aid);
             H5Tclose(tid);
-        } H5E_END_TRY;
+        }
+        H5E_END_TRY;
     }
     return is_ds;
 }
@@ -2024,84 +1995,84 @@ 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;
@@ -2111,13 +2082,15 @@ H5DSget_num_scales(hid_t did, unsigned int idx)
 
     /* 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;
@@ -2139,51 +2112,50 @@ out:
 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;
@@ -2196,7 +2168,6 @@ H5DS_is_reserved(hid_t did)
     if (H5Aclose(aid) < 0)
         goto out;
 
-
     return ret;
 
     /* error zone */
@@ -2205,7 +2176,8 @@ out:
     {
         H5Tclose(tid);
         H5Aclose(aid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return FAIL;
 }
 
@@ -2232,20 +2204,18 @@ 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 {
-        H5Tclose(ntid_t);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { H5Tclose(ntid_t); }
+    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 2b292dc..fb2ccb3 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -1,45 +1,43 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* 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"
 
 /*-------------------------------------------------------------------------
-* Function: H5IMmake_image_8bit
-*
-* Purpose: Creates and writes an image an 8 bit image
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente Nunes
-*
-* 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
+ *
+ * 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)
@@ -50,56 +48,53 @@ 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
-*
-* 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
+ *
+ * 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)
@@ -107,73 +102,65 @@ herr_t H5IMmake_image_24bit( hid_t loc_id,
     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
-*
-* 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
+ *
+ * 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;
 
@@ -182,93 +169,90 @@ static herr_t find_palette(hid_t loc_id,
         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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (interlace == NULL)
-      return -1;
+        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 */
@@ -276,58 +260,55 @@ herr_t H5IMget_image_info( hid_t loc_id,
         goto out;
 
     /* 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];
@@ -335,147 +316,135 @@ 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
-*
-* 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
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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)
 
 {
 
@@ -483,231 +452,221 @@ herr_t H5IMmake_palette( hid_t loc_id,
 
     /* check the arguments */
     if (pal_name == NULL)
-      return -1;
+        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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (pal_name == NULL)
-      return -1;
+        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
-*
-* 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
+ *
+ * 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;
@@ -716,98 +675,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
-*
-* 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
+ *
+ * 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;
@@ -817,495 +772,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
-*
-* 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
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (pal_data == NULL)
-      return -1;
-
+        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
-*
-* 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
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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;
+        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 21975d1..73043a5 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 "H5LDprivate.h"
 
@@ -22,10 +22,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
  *
@@ -43,30 +42,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()
  *
@@ -85,27 +83,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 */
@@ -121,13 +119,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
  *
@@ -153,84 +150,87 @@ 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;
@@ -238,37 +238,36 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[]/*OUT*/, hid_t par_tid)
                     break;
 
                 default:
-                    *cur++ = *fields_ptr++;
+                    *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
  *
@@ -280,38 +279,36 @@ 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 {
-        H5Sclose(sid);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { H5Sclose(sid); }
+    H5E_END_TRY;
 
-    return(ret_value);
+    return (ret_value);
 } /* H5LD_get_dset_dims() */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LD_get_dset_type_size
  *
@@ -330,73 +327,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
  *
@@ -410,136 +406,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;
 
-	/* Copy data for each dataset element in the selection */
-	for(i = 0; i < (int)num_elmts; i++) {
-            int j; 		/* Local index variable */
+        /* Get the total size of the dataset's datatypes */
+        if (0 == (tot_tsize = H5LD_get_dset_type_size(did, NULL)))
+            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 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;
 
-	/* Clean up the vector of H5LD_memb_t structures */
-	H5LD_clean_vector(listv);
+        /* 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;
+
+        /* 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 */
@@ -547,23 +543,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() */
 
 /*-------------------------------------------------------------------------
@@ -573,7 +569,6 @@ done:
  *-------------------------------------------------------------------------
  */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5LDget_dset_dims
  *
@@ -589,11 +584,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
  *
@@ -609,10 +602,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
  *
@@ -626,8 +618,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 0003018..14875fc 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -1,28 +1,27 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* 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 "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;
-
+#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
 
@@ -58,58 +57,58 @@ size_t  indent = 0;
 
 /* 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))
         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)
@@ -123,9 +122,9 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
             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;
 
@@ -159,7 +158,7 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
             if (udata->fapl_ref_count == 0)
                 goto out;
 
-            udata->vfd_image_ptr = udata->fapl_image_ptr;
+            udata->vfd_image_ptr  = udata->fapl_image_ptr;
             udata->vfd_image_size = size;
             udata->vfd_ref_count++;
             return_value = udata->vfd_image_ptr;
@@ -174,33 +173,31 @@ image_malloc(size_t size, H5FD_file_image_op_t file_image_op, void *_udata)
             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;
 
@@ -208,7 +205,7 @@ image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file
     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)
                 goto out;
@@ -260,33 +257,32 @@ image_memcpy(void *dest, const void *src, size_t size, H5FD_file_image_op_t file
             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))
@@ -313,33 +309,32 @@ image_realloc(void *ptr, size_t size, H5FD_file_image_op_t file_image_op, void *
             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)
 {
@@ -349,7 +344,7 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
     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)
                 goto out;
@@ -358,13 +353,14 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
 
             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;
 
@@ -376,13 +372,14 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
 
             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;
 
@@ -397,28 +394,27 @@ image_free(void *ptr, H5FD_file_image_op_t file_image_op, void *_udata)
             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)
 {
@@ -432,28 +428,27 @@ udata_copy(void *_udata)
 
     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)
 {
@@ -468,409 +463,370 @@ udata_free(void *_udata)
     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);
+    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
-*
-* 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
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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;
+        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)
@@ -898,33 +854,33 @@ hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
 
     /* 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)
@@ -951,46 +907,44 @@ hid_t H5LTopen_file_image(void *buf_ptr, size_t buf_size, unsigned flags)
     return file_id;
 
 out:
-    H5E_BEGIN_TRY {
-        H5Pclose(fapl);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { H5Pclose(fapl); }
+    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
-*
-* Date: October 8, 2007
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LT_read_dataset
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Quincey Koziol
+ *
+ * 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;
+        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;
@@ -1001,407 +955,394 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function: H5LTread_dataset
-*
-* Purpose: Reads a dataset from disk.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente
-*
-* Date: June 13, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_char
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_short
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_int
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_long
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_float
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 5, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_double
+ *
+ * Purpose: Reads a dataset from disk.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: October 05, 2004
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTread_dataset_string
+ *
+ * Purpose: Reads a dataset
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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;
+        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
-*
-* Date: September 4, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_dataset_ndims
+ *
+ * Purpose: Gets the dimensionality of a dataset.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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;
+        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
-*
-* Date: June 21, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: find_dataset
+ *
+ * Purpose: operator function used by H5LTfind_dataset
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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.
+ *
+ *-------------------------------------------------------------------------
+ */
 /* H5Literate wants a non-const pointer but we have a const pointer in the API
  * call. It's safe to ignore this because we control the callback, don't
  * modify the op_data buffer (i.e.: dset_name) during the traversal, and the
@@ -1409,105 +1350,102 @@ find_dataset(hid_t loc_id, const char *name, const H5L_info2_t *linfo, void *op_
  */
 H5_GCC_DIAG_OFF("cast-qual")
 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);
 }
 H5_GCC_DIAG_ON("cast-qual")
 
 /*-------------------------------------------------------------------------
-*
-* 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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (attr_name == NULL)
-      return -1;
+        return -1;
     if (attr_data == NULL)
-      return -1;
+        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 +1456,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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (attr_name == NULL)
-      return -1;
+        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,439 +1530,385 @@ out:
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTset_attribute_char
-*
-* Purpose: Create and write an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_char
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_uchar
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_short
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_ushort
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_int
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_uint
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_long
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* Date: March 8, 2004
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_ulong
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: July 25, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
-
+ * Function: H5LTset_attribute_float
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: November 7, 2001
-*
-* Comments:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTset_attribute_double
+ *
+ * Purpose: Create and write an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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
-*
-* Date: June 21, 2001
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: find_attr
+ *
+ * Purpose: operator function used by H5LT_find_attribute
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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;
+        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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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.
+ *
+ *-------------------------------------------------------------------------
+ */
 /* H5Aiterate wants a non-const pointer but we have a const pointer in the API
  * call. It's safe to ignore this because we control the callback, don't
  * modify the op_data buffer (i.e.: attr_name) during the traversal, and the
@@ -2040,122 +1916,113 @@ herr_t H5LTfind_attribute( hid_t loc_id, const char* attr_name )
  */
 H5_GCC_DIAG_OFF("cast-qual")
 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);
 }
 H5_GCC_DIAG_ON("cast-qual")
 
-
 /*-------------------------------------------------------------------------
-* Function: H5LTget_attribute_ndims
-*
-* Purpose: Gets the dimensionality of an attribute.
-*
-* Return: Success: 0, Failure: -1
-*
-* Programmer: Pedro Vicente
-*
-* Date: September 4, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_ndims
+ *
+ * Purpose: Gets the dimensionality of an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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;
+        return -1;
     if (attr_name == NULL)
-      return -1;
+        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
-*
-* Date: September 4, 2001
-*
-*-------------------------------------------------------------------------
-*/
+ * Function: H5LTget_attribute_info
+ *
+ * Purpose: Gets information about an attribute.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Pedro Vicente
+ *
+ * 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;
+        return -1;
     if (attr_name == NULL)
-      return -1;
+        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;
     }
@@ -2167,30 +2034,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;
@@ -2200,46 +2067,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
-*
-* Date: October 6, 2004
-*
-* Comments:
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-hid_t H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type)
+ * Function: H5LTtext_to_dtype
+ *
+ * Purpose:  Convert DDL description to HDF5 data type.
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Raymond Lu
+ *
+ * Date: October 6, 2004
+ *
+ * Comments:
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+hid_t
+H5LTtext_to_dtype(const char *text, H5LT_lang_t lang_type)
 {
-    hid_t   type_id;
+    hid_t type_id;
 
     /* check the arguments */
     if (text == NULL)
-      return -1;
+        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;
     }
@@ -2254,57 +2121,60 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function:    realloc_and_append
-*
-* Purpose:     Expand the buffer and append a string to it.
-*
-* Return:      void
-*
-* Programmer:  Raymond Lu
-*
-* 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
+ *
+ * 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;
@@ -2314,32 +2184,33 @@ out:
 }
 
 /*-------------------------------------------------------------------------
-* Function:    indentation
-*
-* Purpose:     Print spaces for indentation
-*
-* Return:      void
-*
-* Programmer:  Raymond Lu
-*
-* Date:        December 6, 2005
-*
-* Modifications:
-*
-*-------------------------------------------------------------------------
-*/
-static char*
-indentation(size_t x, char* str, hbool_t no_u_buf, size_t *s_len)
+ * Function:    indentation
+ *
+ * Purpose:     Print spaces for indentation
+ *
+ * Return:      void
+ *
+ * Programmer:  Raymond Lu
+ *
+ * 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];
+    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;
@@ -2349,98 +2220,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);
@@ -2451,71 +2323,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
-*
-* 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
+ *
+ * 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;
@@ -2525,38 +2399,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
-*
-* 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
+ *
+ * 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) {
@@ -2564,57 +2438,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");
             }
 
@@ -2622,439 +2522,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;
+
+            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;
 
-                /* Get array information */
-                if((ndims = H5Tget_array_ndims(dtype)) < 0)
+            for (i = 0; i < nmembs; i++) {
+                if ((mname = H5Tget_member_name(dtype, (unsigned)i)) == NULL)
                     goto out;
-                if(H5Tget_array_dims2(dtype, dims) < 0)
+                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;
 
-                /* 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;
@@ -3082,747 +2988,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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (attr_name == NULL)
-      return -1;
+        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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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;
+        return -1;
     if (attr_name == NULL)
-      return -1;
+        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
-*
-* 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
+ *
+ * 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: Pedro Vicente
-*
-* 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: Pedro Vicente
+ *
+ * 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) {
+{
+    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;
-    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;
-         }
-       }
-     }
+
+    /* 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/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index e5f0bea..41e77b0 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -1,61 +1,61 @@
-#if defined __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__    
-#pragma GCC diagnostic ignored "-Wconversion"                     
-#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"  
-#pragma GCC diagnostic ignored "-Wlarger-than="                   
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"             
-#pragma GCC diagnostic ignored "-Wnested-externs"                 
-#pragma GCC diagnostic ignored "-Wold-style-definition"           
-#pragma GCC diagnostic ignored "-Wredundant-decls"                
-#pragma GCC diagnostic ignored "-Wsign-compare"                   
-#pragma GCC diagnostic ignored "-Wsign-conversion"                
-#pragma GCC diagnostic ignored "-Wstrict-overflow"                
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"              
-#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"         
-#pragma GCC diagnostic ignored "-Wswitch-default"                 
-#pragma GCC diagnostic ignored "-Wunused-function"                
-#pragma GCC diagnostic ignored "-Wunused-macros"                  
-#pragma GCC diagnostic ignored "-Wunused-parameter"               
-#elif defined __SUNPRO_CC                                         
-#pragma disable_warn                                              
-#elif defined _MSC_VER                                            
-#pragma warning(push, 1)                                          
-#endif                                                            
+#if defined            __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
+#pragma GCC diagnostic ignored "-Wlarger-than="
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wnested-externs"
+#pragma GCC diagnostic ignored "-Wold-style-definition"
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wstrict-overflow"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-macros"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#elif defined          __SUNPRO_CC
+#pragma disable_warn
+#elif defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #line 2 "hl/src/H5LTanalyze.c"
 
 #line 4 "hl/src/H5LTanalyze.c"
 
-#define  YY_INT_ALIGNED short int
+#define YY_INT_ALIGNED short int
 
 /* A lexical scanner generated by flex */
 
-#define yy_create_buffer H5LTyy_create_buffer
-#define yy_delete_buffer H5LTyy_delete_buffer
-#define yy_scan_buffer H5LTyy_scan_buffer
-#define yy_scan_string H5LTyy_scan_string
-#define yy_scan_bytes H5LTyy_scan_bytes
-#define yy_init_buffer H5LTyy_init_buffer
-#define yy_flush_buffer H5LTyy_flush_buffer
-#define yy_load_buffer_state H5LTyy_load_buffer_state
-#define yy_switch_to_buffer H5LTyy_switch_to_buffer
-#define yypush_buffer_state H5LTyypush_buffer_state
-#define yypop_buffer_state H5LTyypop_buffer_state
+#define yy_create_buffer      H5LTyy_create_buffer
+#define yy_delete_buffer      H5LTyy_delete_buffer
+#define yy_scan_buffer        H5LTyy_scan_buffer
+#define yy_scan_string        H5LTyy_scan_string
+#define yy_scan_bytes         H5LTyy_scan_bytes
+#define yy_init_buffer        H5LTyy_init_buffer
+#define yy_flush_buffer       H5LTyy_flush_buffer
+#define yy_load_buffer_state  H5LTyy_load_buffer_state
+#define yy_switch_to_buffer   H5LTyy_switch_to_buffer
+#define yypush_buffer_state   H5LTyypush_buffer_state
+#define yypop_buffer_state    H5LTyypop_buffer_state
 #define yyensure_buffer_stack H5LTyyensure_buffer_stack
-#define yy_flex_debug H5LTyy_flex_debug
-#define yyin H5LTyyin
-#define yyleng H5LTyyleng
-#define yylex H5LTyylex
-#define yylineno H5LTyylineno
-#define yyout H5LTyyout
-#define yyrestart H5LTyyrestart
-#define yytext H5LTyytext
-#define yywrap H5LTyywrap
-#define yyalloc H5LTyyalloc
-#define yyrealloc H5LTyyrealloc
-#define yyfree H5LTyyfree
+#define yy_flex_debug         H5LTyy_flex_debug
+#define yyin                  H5LTyyin
+#define yyleng                H5LTyyleng
+#define yylex                 H5LTyylex
+#define yylineno              H5LTyylineno
+#define yyout                 H5LTyyout
+#define yyrestart             H5LTyyrestart
+#define yytext                H5LTyytext
+#define yywrap                H5LTyywrap
+#define yyalloc               H5LTyyalloc
+#define yyrealloc             H5LTyyrealloc
+#define yyfree                H5LTyyfree
 
 #define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 6
+#define YY_FLEX_MAJOR_VERSION    2
+#define YY_FLEX_MINOR_VERSION    6
 #define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
@@ -312,61 +312,61 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
+ * if you want the limit (max/min) macros for int types.
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
 #endif
 
 #include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
+typedef int8_t   flex_int8_t;
+typedef uint8_t  flex_uint8_t;
+typedef int16_t  flex_int16_t;
 typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
+typedef int32_t  flex_int32_t;
 typedef uint32_t flex_uint32_t;
 #else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
+typedef signed char        flex_int8_t;
+typedef short int          flex_int16_t;
+typedef int                flex_int32_t;
+typedef unsigned char      flex_uint8_t;
 typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
+typedef unsigned int       flex_uint32_t;
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
-#define INT8_MIN               (-128)
+#define INT8_MIN (-128)
 #endif
 #ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
+#define INT16_MIN (-32767 - 1)
 #endif
 #ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
+#define INT32_MIN (-2147483647 - 1)
 #endif
 #ifndef INT8_MAX
-#define INT8_MAX               (127)
+#define INT8_MAX (127)
 #endif
 #ifndef INT16_MAX
-#define INT16_MAX              (32767)
+#define INT16_MAX (32767)
 #endif
 #ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
+#define INT32_MAX (2147483647)
 #endif
 #ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
+#define UINT8_MAX (255U)
 #endif
 #ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
+#define UINT16_MAX (65535U)
 #endif
 #ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
+#define UINT32_MAX (4294967295U)
 #endif
 
 #ifndef SIZE_MAX
-#define SIZE_MAX               (~(size_t)0)
+#define SIZE_MAX (~(size_t)0)
 #endif
 
 #endif /* ! C99 */
@@ -390,7 +390,7 @@ typedef unsigned int flex_uint32_t;
 /* Promotes a possibly negative, possibly signed char to an
  *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
+#define YY_SC_TO_UI(c) ((YY_CHAR)(c))
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
@@ -401,12 +401,12 @@ typedef unsigned int flex_uint32_t;
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
+#define YY_START (((yy_start)-1) / 2)
+#define YYSTATE  YY_START
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin  )
+#define YY_NEW_FILE           yyrestart(yyin)
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
@@ -424,7 +424,7 @@ typedef unsigned int flex_uint32_t;
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
  */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
 #ifndef YY_TYPEDEF_YY_BUFFER_STATE
 #define YY_TYPEDEF_YY_BUFFER_STATE
@@ -441,96 +441,91 @@ extern int yyleng;
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-    
-    #define YY_LESS_LINENO(n)
-    #define YY_LINENO_REWIND_TO(ptr)
-    
+#define EOB_ACT_END_OF_FILE   1
+#define EOB_ACT_LAST_MATCH    2
+
+#define YY_LESS_LINENO(n)
+#define YY_LINENO_REWIND_TO(ptr)
+
 /* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		*yy_cp = (yy_hold_char); \
-		YY_RESTORE_YY_MORE_OFFSET \
-		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-#define unput(c) yyunput( c, (yytext_ptr)  )
+#define yyless(n)                                                                                            \
+    do {                                                                                                     \
+        /* Undo effects of setting up yytext. */                                                             \
+        int yyless_macro_arg = (n);                                                                          \
+        YY_LESS_LINENO(yyless_macro_arg);                                                                    \
+        *yy_cp                                = (yy_hold_char);                                              \
+        YY_RESTORE_YY_MORE_OFFSET(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ;              \
+        YY_DO_BEFORE_ACTION; /* set up yytext again */                                                       \
+    } while (0)
+#define unput(c) yyunput(c, (yytext_ptr))
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	int yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
+struct yy_buffer_state {
+    FILE *yy_input_file;
+
+    char *yy_ch_buf;  /* input buffer */
+    char *yy_buf_pos; /* current position in input buffer */
+
+    /* Size of input buffer in bytes, not including room for EOB
+     * characters.
+     */
+    int yy_buf_size;
+
+    /* Number of characters read into yy_ch_buf, not including EOB
+     * characters.
+     */
+    int yy_n_chars;
+
+    /* Whether we "own" the buffer - i.e., we know we created it,
+     * and can realloc() it to grow it, and should free() it to
+     * delete it.
+     */
+    int yy_is_our_buffer;
+
+    /* Whether this is an "interactive" input source; if so, and
+     * if we're using stdio for input, then we want to use getc()
+     * instead of fread(), to make sure we stop fetching input after
+     * each newline.
+     */
+    int yy_is_interactive;
+
+    /* Whether we're considered to be at the beginning of a line.
+     * If so, '^' rules will be active on the next match, otherwise
+     * not.
+     */
+    int yy_at_bol;
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
 
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
+    /* Whether to try to fill the input buffer when we reach the
+     * end of it.
+     */
+    int yy_fill_buffer;
 
-	int yy_buffer_status;
+    int yy_buffer_status;
 
-#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NEW    0
 #define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
+    /* When an EOF's been seen but there's still some text to process
+     * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+     * shouldn't try reading from the input source any more.  We might
+     * still have a bunch of tokens to match, though, because of
+     * possible backing-up.
+     *
+     * When we actually see the EOF, we change the status to "new"
+     * (via yyrestart()), so that the user can continue scanning by
+     * just pointing yyin at a new input file.
+     */
 #define YY_BUFFER_EOF_PENDING 2
-
-	};
+};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
 /* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
+static size_t           yy_buffer_stack_top = 0;    /**< index of top of stack. */
+static size_t           yy_buffer_stack_max = 0;    /**< capacity of stack. */
+static YY_BUFFER_STATE *yy_buffer_stack     = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -538,9 +533,7 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
  *
  * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
+#define YY_CURRENT_BUFFER ((yy_buffer_stack) ? (yy_buffer_stack)[(yy_buffer_stack_top)] : NULL)
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
@@ -548,59 +541,57 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int yyleng;
+static int  yy_n_chars; /* number of characters read into yy_ch_buf */
+int         yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = NULL;
-static int yy_init = 0;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
+static int   yy_init    = 0; /* whether we need to initialize */
+static int   yy_start   = 0; /* start state number */
 
 /* Flag which is used to allow yywrap()'s to do buffer switches
  * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart ( FILE *input_file  );
-void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
-void yy_delete_buffer ( YY_BUFFER_STATE b  );
-void yy_flush_buffer ( YY_BUFFER_STATE b  );
-void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state ( void );
+void            yyrestart(FILE *input_file);
+void            yy_switch_to_buffer(YY_BUFFER_STATE new_buffer);
+YY_BUFFER_STATE yy_create_buffer(FILE *file, int size);
+void            yy_delete_buffer(YY_BUFFER_STATE b);
+void            yy_flush_buffer(YY_BUFFER_STATE b);
+void            yypush_buffer_state(YY_BUFFER_STATE new_buffer);
+void            yypop_buffer_state(void);
 
-static void yyensure_buffer_stack ( void );
-static void yy_load_buffer_state ( void );
-static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
-#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
+static void yyensure_buffer_stack(void);
+static void yy_load_buffer_state(void);
+static void yy_init_buffer(YY_BUFFER_STATE b, FILE *file);
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER)
 
-YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
+YY_BUFFER_STATE yy_scan_buffer(char *base, yy_size_t size);
+YY_BUFFER_STATE yy_scan_string(const char *yy_str);
+YY_BUFFER_STATE yy_scan_bytes(const char *bytes, int len);
 
-void *yyalloc ( yy_size_t  );
-void *yyrealloc ( void *, yy_size_t  );
-void yyfree ( void *  );
+void *yyalloc(yy_size_t);
+void *yyrealloc(void *, yy_size_t);
+void  yyfree(void *);
 
 #define yy_new_buffer yy_create_buffer
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-	}
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-		YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	} \
-	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-	}
+#define yy_set_interactive(is_interactive)                                                                   \
+    {                                                                                                        \
+        if (!YY_CURRENT_BUFFER) {                                                                            \
+            yyensure_buffer_stack();                                                                         \
+            YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE);                                  \
+        }                                                                                                    \
+        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive;                                        \
+    }
+#define yy_set_bol(at_bol)                                                                                   \
+    {                                                                                                        \
+        if (!YY_CURRENT_BUFFER) {                                                                            \
+            yyensure_buffer_stack();                                                                         \
+            YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE);                                  \
+        }                                                                                                    \
+        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol;                                                        \
+    }
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
@@ -611,7 +602,7 @@ FILE *yyin = NULL, *yyout = NULL;
 typedef int yy_state_type;
 
 extern int yylineno;
-int yylineno = 1;
+int        yylineno = 1;
 
 extern char *yytext;
 #ifdef yytext_ptr
@@ -619,481 +610,272 @@ extern char *yytext;
 #endif
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state ( void );
-static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
-static int yy_get_next_buffer ( void );
-static void yynoreturn yy_fatal_error ( const char* msg  );
+static yy_state_type   yy_get_previous_state(void);
+static yy_state_type   yy_try_NUL_trans(yy_state_type current_state);
+static int             yy_get_next_buffer(void);
+static void yynoreturn yy_fatal_error(const char *msg);
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
-#define YY_DO_BEFORE_ACTION \
-	(yytext_ptr) = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	(yy_hold_char) = *yy_cp; \
-	*yy_cp = '\0'; \
-	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 66
+#define YY_DO_BEFORE_ACTION                                                                                  \
+    (yytext_ptr)   = yy_bp;                                                                                  \
+    yyleng         = (int)(yy_cp - yy_bp);                                                                   \
+    (yy_hold_char) = *yy_cp;                                                                                 \
+    *yy_cp         = '\0';                                                                                   \
+    (yy_c_buf_p)   = yy_cp;
+#define YY_NUM_RULES     66
 #define YY_END_OF_BUFFER 67
 /* This struct is not used in this scanner,
    but its presence is necessary. */
-struct yy_trans_info
-	{
-	flex_int32_t yy_verify;
-	flex_int32_t yy_nxt;
-	};
-static const flex_int16_t yy_acclist[437] =
-    {   0,
-       64,   64,   64,   64,   67,   66,   64,   66,   64,   65,
-       66,   56,   66,   55,   66,   62,   66,   63,   66,   66,
-       66,   66,   66,   60,   66,   61,   66,   58,   66,   59,
-       66,   57,   66,   57,   64,   66,   57,   64,   65,   66,
-       55,   57,   66,   57,   62,   66,   57,   63,   66,   57,
-       66,   57,   66,   57,   66,   57,   66,   57,   60,   66,
-       57,   61,   66,   57,   58,   66,   57,   59,   66,   64,
-       55,   57,   57,   64,   55,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   38,   38,   57,   57,
-       57,   57,   57,   57,   39,   39,   57,   57,   57,   57,
-
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       37,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   37,   57,   57,   54,   36,
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   54,   57,   36,   57,   45,   49,
-       51,   53,   57,   57,   57,   45,   57,   49,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   51,   57,   53,
-       57,   50,   50,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   52,   35,   57,   57,
-       57,   57,   57,   57,   52,   57,   57,   57,   57,   57,
-
-       57,   57,   57,   57,   35,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   48,
-        1,    2,    9,   10,   47,   48,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   57,   57,   57,   57,    1,   57,    2,   57,   57,
-       57,   57,   57,   57,   57,    9,   57,   10,   57,   57,
-       57,   47,   57,   44,    3,    4,    5,    6,    7,    8,
-       11,   12,   13,   14,   15,   16,   57,   44,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-
-       57,   57,   57,   57,   57,   57,   57,    3,   57,    4,
-       57,    5,   57,    6,   57,    7,   57,    8,   57,   11,
-       57,   12,   57,   13,   57,   14,   57,   15,   57,   16,
-       57,   57,   57,   57,   43,   46,   28,   29,   30,   31,
-       22,   43,   57,   46,   57,   28,   57,   29,   57,   30,
-       57,   31,   57,   57,   57,   57,   22,   57,   57,   57,
-       57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
-       57,   17,   24,   23,   41,   17,   57,   57,   57,   57,
-       57,   24,   57,   57,   57,   57,   23,   57,   57,   57,
-       57,   41,   57,   57,   57,   32,   26,   18,   20,   19,
-
-       25,   40,   42,   57,   32,   57,   57,   26,   57,   18,
-       57,   20,   57,   19,   57,   57,   25,   57,   57,   40,
-       57,   42,   57,   33,   27,   21,   33,   57,   57,   27,
-       57,   21,   57,   34,   34,   57
-    } ;
-
-static const flex_int16_t yy_accept[546] =
-    {   0,
-        1,    2,    3,    4,    5,    6,    7,    9,   12,   14,
-       16,   18,   20,   21,   22,   23,   24,   26,   28,   30,
-       32,   34,   37,   41,   44,   47,   50,   52,   54,   56,
-       58,   61,   64,   67,   70,   71,   72,   72,   72,   72,
-       72,   72,   73,   75,   77,   78,   79,   80,   81,   82,
-       82,   82,   82,   82,   82,   83,   84,   85,   86,   87,
-       88,   88,   88,   88,   88,   88,   90,   91,   92,   93,
-       94,   95,   96,   96,   96,   96,   96,   96,   96,   96,
-       96,   96,   96,   96,   96,   96,   98,   99,  100,  101,
-      102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
-
-      111,  111,  111,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  112,  112,  113,  114,  115,  116,
-      117,  118,  119,  120,  121,  122,  123,  124,  125,  126,
-      128,  129,  129,  129,  129,  129,  129,  129,  129,  129,
-      129,  129,  129,  129,  129,  129,  130,  131,  132,  133,
-      134,  135,  136,  137,  138,  139,  140,  141,  142,  143,
-      144,  145,  147,  149,  149,  149,  149,  150,  151,  151,
-      151,  151,  151,  151,  151,  151,  151,  152,  153,  154,
-      155,  156,  158,  160,  161,  162,  163,  164,  165,  166,
-      167,  168,  170,  172,  173,  173,  173,  173,  173,  173,
-
-      173,  173,  173,  173,  173,  173,  173,  175,  176,  177,
-      178,  179,  180,  181,  182,  183,  184,  185,  186,  187,
-      187,  187,  187,  187,  187,  187,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  189,  189,  189,  189,  190,
-      191,  192,  193,  194,  195,  197,  198,  199,  200,  201,
-      202,  203,  204,  205,  207,  208,  209,  210,  210,  210,
-      210,  210,  210,  210,  210,  210,  210,  210,  210,  210,
-      210,  210,  210,  210,  210,  210,  210,  210,  211,  212,
-      213,  214,  215,  216,  217,  218,  219,  220,  221,  222,
-      223,  224,  225,  226,  227,  228,  229,  230,  231,  231,
-
-      231,  231,  231,  231,  231,  231,  231,  231,  231,  231,
-      231,  231,  231,  231,  231,  231,  231,  232,  233,  233,
-      233,  233,  233,  233,  233,  234,  235,  235,  235,  236,
-      238,  239,  240,  241,  242,  243,  244,  245,  246,  247,
-      248,  249,  250,  251,  252,  253,  254,  255,  256,  258,
-      260,  261,  262,  263,  264,  265,  266,  268,  270,  271,
-      272,  274,  274,  275,  275,  275,  275,  275,  275,  275,
-      275,  275,  275,  275,  275,  275,  275,  275,  275,  275,
-      275,  275,  276,  277,  278,  279,  280,  281,  282,  283,
-      284,  285,  286,  287,  287,  287,  287,  288,  290,  291,
-
-      292,  293,  294,  295,  296,  297,  298,  299,  300,  301,
-      302,  303,  304,  305,  306,  307,  308,  310,  312,  314,
-      316,  318,  320,  322,  324,  326,  328,  330,  332,  333,
-      334,  335,  336,  337,  338,  339,  340,  341,  341,  341,
-      341,  342,  342,  342,  342,  342,  342,  342,  342,  342,
-      342,  342,  342,  342,  342,  344,  346,  348,  350,  352,
-      354,  355,  356,  357,  359,  360,  361,  362,  363,  364,
-      365,  366,  367,  368,  369,  370,  371,  372,  373,  373,
-      373,  373,  373,  374,  374,  374,  374,  375,  375,  375,
-      375,  376,  376,  376,  378,  379,  380,  381,  382,  384,
-
-      385,  386,  387,  389,  390,  391,  392,  394,  395,  396,
-      396,  397,  397,  398,  399,  400,  401,  401,  402,  402,
-      403,  404,  405,  407,  408,  410,  412,  414,  416,  417,
-      419,  420,  422,  424,  425,  425,  426,  427,  429,  430,
-      432,  434,  435,  437,  437
-    } ;
-
-static const YY_CHAR yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    4,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    5,    6,    7,
-        8,    9,   10,   11,    5,   12,    5,   13,   14,    1,
-        1,    1,    1,    1,   15,   16,   17,   18,   19,   20,
-       21,   22,   23,    1,    1,   24,   25,   26,   27,   28,
-       29,   30,   31,   32,   33,   34,    1,    1,   35,   36,
-       37,    1,   38,    1,   39,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,   40,    1,   41,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static const YY_CHAR yy_meta[42] =
-    {   0,
-        1,    1,    1,    2,    3,    3,    3,    3,    3,    3,
-        3,    3,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1
-    } ;
-
-static const flex_int16_t yy_base[547] =
-    {   0,
-        0,    0,   41,    0,  610,  611,   81,   83,  611,    0,
-      611,  611,   56,  599,  580,  575,  611,  611,  611,  611,
-        0,   87,   89,   88,    0,    0,   70,  596,  577,  572,
-        0,    0,    0,    0,  101,    0,  584,  567,  569,  571,
-      569,    0,  103,    0,  579,  562,  564,  566,  564,  561,
-      564,  552,  551,   79,  557,  560,  548,  547,   80,  611,
-      566,   97,   87,  569,  560,    0,  563,  117,   90,  566,
-      557,  611,  549,   99,  552,  550,  557,  560,  546,  541,
-      118,  549,  556,  552,  533,    0,  538,  108,  541,  539,
-      546,  549,  535,  530,  126,  538,  545,  541,  522,  527,
-
-      531,  536,  523,  520,  522,  532,  518,  534,   95,  518,
-      528,  510,  524,  611,  525,  513,  517,  522,  509,  506,
-      508,  518,  504,  520,   97,  504,  514,  496,  510,    0,
-      511,  514,  500,  495,  520,  500,  492,  504,  499,  492,
-      481,  106,  496,  492,  498,  611,  611,  501,  487,  482,
-      507,  487,  479,  491,  486,  479,  468,  123,  483,  479,
-      485,    0,    0,  468,  475,  462,  611,  611,  470,  460,
-      464,  464,  126,  470,  126,  480,  611,  611,  459,  466,
-      453,    0,    0,  461,  451,  455,  455,  130,  461,  129,
-      471,    0,    0,  611,  452,  139,  469,  463,  463,  462,
-
-      158,  165,  459,  446,  450,  461,    0,  443,  141,  460,
-      454,  454,  453,  172,  179,  450,  437,  441,  452,  441,
-      435,  433,  438,  150,  424,  611,  451,  454,  451,  151,
-      448,  451,  448,  165,  611,  432,  440,  430,  427,  421,
-      419,  424,  157,  410,    0,  437,  440,  437,  170,  434,
-      437,  434,  172,    0,  418,  426,  416,  421,  421,  417,
-      397,  428,  425,  180,  177,  183,  186,  414,  413,  190,
-      192,  193,  412,  411,  405,  411,  408,  408,  408,  404,
-      384,  415,  412,  201,  196,  199,  206,  401,  400,  211,
-      212,  213,  399,  398,  392,  398,  395,  611,  390,  400,
-
-      380,  215,  217,  388,  382,  384,  381,  220,  223,  225,
-      387,  386,  385,  384,  383,  382,  611,  611,  381,  380,
-      379,  378,  377,  376,  611,  611,  218,  375,  611,    0,
-      370,  380,  360,  227,  236,  368,  362,  364,  361,  235,
-      241,  244,  367,  366,  365,  364,  363,  362,    0,    0,
-      361,  360,  359,  358,  357,  356,    0,    0,  237,  355,
-        0,  350,  611,  366,  352,  351,  350,  349,  352,  333,
-      338,  332,  336,  335,  335,  338,  332,  336,  331,  155,
-      334,  611,  611,  611,  611,  611,  611,  611,  611,  611,
-      611,  611,  611,  340,  335,  325,  329,    0,  345,  331,
-
-      330,  329,  328,  331,  312,  317,  311,  315,  314,  314,
-      317,  311,  315,  310,  168,  313,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  319,  314,
-      304,  611,  611,  611,  611,  611,  611,  301,  314,  314,
-      611,  295,  301,  305,  310,  294,  308,  290,  294,  294,
-      292,  300,  287,  301,    0,    0,    0,    0,    0,    0,
-      285,  298,  298,    0,  279,  285,  289,  294,  278,  292,
-      274,  278,  278,  276,  284,  271,  285,  611,  275,  266,
-      281,  275,  611,  265,  262,  263,  611,  266,  270,  260,
-      611,  264,  270,    0,  263,  254,  269,  263,    0,  253,
-
-      250,  251,    0,  254,  258,  247,    0,  249,  255,  253,
-      611,  247,  611,  611,  611,  611,  249,  611,  234,  611,
-      611,  245,    0,  233,    0,    0,    0,    0,  234,    0,
-      222,    0,    0,  611,  207,  611,  611,    0,  186,    0,
-        0,  611,    0,  611,  106,  275
-    } ;
-
-static const flex_int16_t yy_def[547] =
-    {   0,
-      544,    1,  544,    3,  544,  544,  544,  544,  544,  545,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  544,  545,  544,  544,  544,  544,
-      544,  546,  546,   24,  546,  546,  546,  546,  546,  544,
-      544,  544,  544,  544,  546,  546,  546,  546,  546,  544,
-      544,  544,  544,  544,  544,  546,  546,  546,  546,  546,
-      546,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  544,
-
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  544,  544,  544,  544,  544,  544,  544,
-
-      544,  544,  544,  544,  544,  544,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  544,  544,  544,
-
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  546,  546,  546,  546,
-
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  546,  546,  546,  546,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  546,  546,  546,  546,  546,  546,  546,
-
-      546,  546,  546,  546,  546,  546,  546,  546,  546,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      546,  546,  546,  544,  544,  544,  544,  546,  546,  546,
-      546,  544,  546,    0,  544,  544
-    } ;
-
-static const flex_int16_t yy_nxt[653] =
-    {   0,
-        6,    7,    8,    9,   10,   10,   10,   10,   10,   10,
-       10,   10,   11,   12,    6,    6,   13,    6,    6,    6,
-        6,   14,    6,    6,    6,    6,   15,    6,    6,    6,
-       16,    6,    6,    6,    6,    6,   17,   18,    6,   19,
-       20,   21,   22,   23,    9,   24,   24,   24,   24,   24,
-       24,   24,   24,   25,   26,   21,   21,   27,   21,   21,
-       21,   21,   28,   21,   21,   21,   21,   29,   21,   21,
-       21,   30,   21,   21,   21,   21,   21,   31,   32,   21,
-       33,   34,   35,   35,   35,   35,   37,   38,   43,   43,
-       43,   43,   44,   44,   44,   44,   44,   44,   44,   44,
-
-       45,   46,   35,   35,   43,   43,   64,   70,   36,   65,
-       71,   73,  141,   74,  157,   75,   76,   82,   83,   77,
-       96,   97,   78,   79,  142,  101,  158,   80,  174,  102,
-       81,   87,  110,   88,  117,   89,   90,  103,  118,   91,
-      126,  111,   92,   93,  175,  189,  119,   94,  201,  127,
-       95,  204,  214,  221,  217,  240,  205,  262,  202,  218,
-      263,  190,  215,  227,  282,  228,  268,  283,  229,  230,
-      231,  222,  232,  241,  269,  233,  234,  246,  449,  247,
-      273,  450,  248,  249,  250,  288,  251,  293,  274,  252,
-      253,  472,  311,  289,  473,  294,  304,  305,  313,  306,
-
-      312,  315,  307,  308,  543,  319,  314,  321,  323,  316,
-      309,  343,  310,  320,  345,  322,  324,  336,  337,  344,
-      338,  347,  346,  339,  340,  542,  351,  353,  355,  348,
-      365,  341,  367,  342,  352,  354,  356,  373,  366,  376,
-      368,  378,  400,  374,  377,  394,  375,  379,  380,  395,
-      401,  402,  408,  541,  540,  381,  539,  411,  409,  403,
-      413,  410,  412,  538,  429,  537,  414,  415,  430,  536,
-      535,  534,  533,  532,  416,   42,  531,   42,  530,  529,
-      528,  527,  526,  525,  524,  523,  522,  521,  520,  519,
-      518,  517,  516,  515,  514,  513,  512,  511,  510,  509,
-
-      508,  507,  506,  505,  504,  503,  502,  501,  500,  499,
-      498,  497,  496,  495,  494,  493,  492,  491,  490,  489,
-      488,  487,  486,  485,  484,  483,  482,  481,  480,  479,
-      478,  477,  476,  475,  474,  471,  470,  469,  468,  467,
-      466,  465,  464,  463,  462,  461,  460,  459,  458,  457,
-      456,  455,  454,  453,  452,  451,  448,  447,  446,  445,
-      444,  443,  442,  441,  440,  439,  438,  437,  436,  435,
-      434,  433,  432,  431,  428,  427,  426,  425,  424,  423,
-      422,  421,  420,  419,  418,  417,  407,  406,  405,  404,
-      399,  398,  397,  396,  393,  392,  391,  390,  389,  388,
-
-      387,  386,  385,  384,  383,  382,  372,  371,  370,  369,
-      364,  363,  362,  361,  360,  359,  358,  357,  350,  349,
-      335,  334,  333,  332,  331,  330,  329,  328,  327,  326,
-      325,  318,  317,  303,  302,  301,  300,  299,  298,  297,
-      296,  295,  292,  291,  290,  287,  286,  285,  284,  281,
-      280,  279,  278,  277,  276,  275,  272,  271,  270,  267,
-      266,  265,  264,  261,  260,  259,  258,  257,  256,  255,
-      254,  245,  244,  243,  242,  239,  238,  237,  236,  235,
-      226,  225,  224,  223,  220,  219,  216,  213,  212,  211,
-      210,  209,  208,  207,  206,  203,  200,  199,  198,  197,
-
-      196,  195,  194,  193,  192,  191,  188,  187,  186,  185,
-      184,  183,  182,  181,  180,  179,  178,  177,  176,  173,
-      172,  171,  170,  169,  168,  167,  166,  165,  164,  163,
-      162,  161,  160,  159,  156,  155,  154,  153,  152,  151,
-      150,  149,  148,  147,  146,  145,  144,  143,  140,  139,
-      138,  137,  136,  135,  134,  133,  132,  131,  130,  129,
-      128,  125,  124,  123,  122,  121,  120,  116,  115,  114,
-      113,  112,  109,  108,  107,  106,  105,  104,  100,   99,
-       98,   86,   85,   84,   72,   69,   68,   67,   66,   63,
-       62,   61,   60,   59,   58,   57,   56,   55,   54,   53,
-
-       52,   51,   50,   49,   48,   47,   41,   40,   39,  544,
-        5,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544
-    } ;
-
-static const flex_int16_t yy_chk[653] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    7,    7,    8,    8,   13,   13,   22,   22,
-       23,   23,   24,   24,   24,   24,   24,   24,   24,   24,
-
-       27,   27,   35,   35,   43,   43,   54,   59,  545,   54,
-       59,   62,  109,   62,  125,   62,   62,   63,   63,   62,
-       69,   69,   62,   62,  109,   74,  125,   62,  142,   74,
-       62,   68,   81,   68,   88,   68,   68,   74,   88,   68,
-       95,   81,   68,   68,  142,  158,   88,   68,  173,   95,
-       68,  175,  188,  196,  190,  209,  175,  224,  173,  190,
-      224,  158,  188,  201,  243,  201,  230,  243,  201,  201,
-      202,  196,  202,  209,  230,  202,  202,  214,  380,  214,
-      234,  380,  214,  214,  215,  249,  215,  253,  234,  215,
-      215,  415,  265,  249,  415,  253,  264,  264,  266,  264,
-
-      265,  267,  264,  264,  539,  270,  266,  271,  272,  267,
-      264,  285,  264,  270,  286,  271,  272,  284,  284,  285,
-      284,  287,  286,  284,  284,  535,  290,  291,  292,  287,
-      302,  284,  303,  284,  290,  291,  292,  308,  302,  309,
-      303,  310,  334,  308,  309,  327,  308,  310,  310,  327,
-      334,  335,  340,  531,  529,  310,  524,  341,  340,  335,
-      342,  340,  341,  522,  359,  519,  342,  342,  359,  517,
-      512,  510,  509,  508,  342,  546,  506,  546,  505,  504,
-      502,  501,  500,  498,  497,  496,  495,  493,  492,  490,
-      489,  488,  486,  485,  484,  482,  481,  480,  479,  477,
-
-      476,  475,  474,  473,  472,  471,  470,  469,  468,  467,
-      466,  465,  463,  462,  461,  454,  453,  452,  451,  450,
-      449,  448,  447,  446,  445,  444,  443,  442,  440,  439,
-      438,  431,  430,  429,  416,  414,  413,  412,  411,  410,
-      409,  408,  407,  406,  405,  404,  403,  402,  401,  400,
-      399,  397,  396,  395,  394,  381,  379,  378,  377,  376,
-      375,  374,  373,  372,  371,  370,  369,  368,  367,  366,
-      365,  364,  362,  360,  356,  355,  354,  353,  352,  351,
-      348,  347,  346,  345,  344,  343,  339,  338,  337,  336,
-      333,  332,  331,  328,  324,  323,  322,  321,  320,  319,
-
-      316,  315,  314,  313,  312,  311,  307,  306,  305,  304,
-      301,  300,  299,  297,  296,  295,  294,  293,  289,  288,
-      283,  282,  281,  280,  279,  278,  277,  276,  275,  274,
-      273,  269,  268,  263,  262,  261,  260,  259,  258,  257,
-      256,  255,  252,  251,  250,  248,  247,  246,  244,  242,
-      241,  240,  239,  238,  237,  236,  233,  232,  231,  229,
-      228,  227,  225,  223,  222,  221,  220,  219,  218,  217,
-      216,  213,  212,  211,  210,  208,  206,  205,  204,  203,
-      200,  199,  198,  197,  195,  191,  189,  187,  186,  185,
-      184,  181,  180,  179,  176,  174,  172,  171,  170,  169,
-
-      166,  165,  164,  161,  160,  159,  157,  156,  155,  154,
-      153,  152,  151,  150,  149,  148,  145,  144,  143,  141,
-      140,  139,  138,  137,  136,  135,  134,  133,  132,  131,
-      129,  128,  127,  126,  124,  123,  122,  121,  120,  119,
-      118,  117,  116,  115,  113,  112,  111,  110,  108,  107,
-      106,  105,  104,  103,  102,  101,  100,   99,   98,   97,
-       96,   94,   93,   92,   91,   90,   89,   87,   85,   84,
-       83,   82,   80,   79,   78,   77,   76,   75,   73,   71,
-       70,   67,   65,   64,   61,   58,   57,   56,   55,   53,
-       52,   51,   50,   49,   48,   47,   46,   45,   41,   40,
-
-       39,   38,   37,   30,   29,   28,   16,   15,   14,    5,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544,  544,  544,  544,  544,  544,  544,  544,  544,
-      544,  544
-    } ;
+struct yy_trans_info {
+    flex_int32_t yy_verify;
+    flex_int32_t yy_nxt;
+};
+static const flex_int16_t yy_acclist[437] = {
+    0,  64, 64, 64, 64, 67, 66, 64, 66, 64, 65, 66, 56, 66, 55, 66, 62, 66, 63, 66, 66, 66, 66, 66, 60, 66,
+    61, 66, 58, 66, 59, 66, 57, 66, 57, 64, 66, 57, 64, 65, 66, 55, 57, 66, 57, 62, 66, 57, 63, 66, 57, 66,
+    57, 66, 57, 66, 57, 66, 57, 60, 66, 57, 61, 66, 57, 58, 66, 57, 59, 66, 64, 55, 57, 57, 64, 55, 57, 57,
+    57, 57, 57, 57, 57, 57, 57, 57, 57, 38, 38, 57, 57, 57, 57, 57, 57, 39, 39, 57, 57, 57, 57,
+
+    57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 37, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 37,
+    57, 57, 54, 36, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 54, 57, 36, 57, 45, 49, 51, 53,
+    57, 57, 57, 45, 57, 49, 57, 57, 57, 57, 57, 57, 57, 57, 57, 51, 57, 53, 57, 50, 50, 57, 57, 57, 57, 57,
+    57, 57, 57, 57, 57, 57, 57, 57, 52, 35, 57, 57, 57, 57, 57, 57, 52, 57, 57, 57, 57, 57,
+
+    57, 57, 57, 57, 35, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+    57, 57, 57, 48, 1,  2,  9,  10, 47, 48, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+    57, 57, 57, 1,  57, 2,  57, 57, 57, 57, 57, 57, 57, 9,  57, 10, 57, 57, 57, 47, 57, 44, 3,  4,  5,  6,
+    7,  8,  11, 12, 13, 14, 15, 16, 57, 44, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
+
+    57, 57, 57, 57, 57, 57, 57, 3,  57, 4,  57, 5,  57, 6,  57, 7,  57, 8,  57, 11, 57, 12, 57, 13, 57, 14,
+    57, 15, 57, 16, 57, 57, 57, 57, 43, 46, 28, 29, 30, 31, 22, 43, 57, 46, 57, 28, 57, 29, 57, 30, 57, 31,
+    57, 57, 57, 57, 22, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 57, 17, 24, 23, 41, 17, 57, 57,
+    57, 57, 57, 24, 57, 57, 57, 57, 23, 57, 57, 57, 57, 41, 57, 57, 57, 32, 26, 18, 20, 19,
+
+    25, 40, 42, 57, 32, 57, 57, 26, 57, 18, 57, 20, 57, 19, 57, 57, 25, 57, 57, 40, 57, 42, 57, 33, 27, 21,
+    33, 57, 57, 27, 57, 21, 57, 34, 34, 57};
+
+static const flex_int16_t yy_accept[546] = {
+    0,   1,   2,   3,   4,   5,   6,   7,   9,   12,  14,  16,  18,  20,  21,  22,  23,  24,  26,  28,  30,
+    32,  34,  37,  41,  44,  47,  50,  52,  54,  56,  58,  61,  64,  67,  70,  71,  72,  72,  72,  72,  72,
+    72,  73,  75,  77,  78,  79,  80,  81,  82,  82,  82,  82,  82,  82,  83,  84,  85,  86,  87,  88,  88,
+    88,  88,  88,  88,  90,  91,  92,  93,  94,  95,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,  96,
+    96,  96,  96,  98,  99,  100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+
+    111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, 112, 112, 113, 114, 115, 116, 117,
+    118, 119, 120, 121, 122, 123, 124, 125, 126, 128, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129,
+    129, 129, 129, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 147,
+    149, 149, 149, 149, 150, 151, 151, 151, 151, 151, 151, 151, 151, 151, 152, 153, 154, 155, 156, 158, 160,
+    161, 162, 163, 164, 165, 166, 167, 168, 170, 172, 173, 173, 173, 173, 173, 173,
+
+    173, 173, 173, 173, 173, 173, 173, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 187,
+    187, 187, 187, 187, 187, 188, 188, 188, 188, 188, 188, 188, 188, 188, 189, 189, 189, 189, 190, 191, 192,
+    193, 194, 195, 197, 198, 199, 200, 201, 202, 203, 204, 205, 207, 208, 209, 210, 210, 210, 210, 210, 210,
+    210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 210, 211, 212, 213, 214, 215, 216,
+    217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 231,
+
+    231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 231, 232, 233, 233, 233,
+    233, 233, 233, 233, 234, 235, 235, 235, 236, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249,
+    250, 251, 252, 253, 254, 255, 256, 258, 260, 261, 262, 263, 264, 265, 266, 268, 270, 271, 272, 274, 274,
+    275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 275, 276, 277,
+    278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 287, 287, 287, 288, 290, 291,
+
+    292, 293, 294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 310, 312, 314, 316,
+    318, 320, 322, 324, 326, 328, 330, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 341, 341, 341, 342,
+    342, 342, 342, 342, 342, 342, 342, 342, 342, 342, 342, 342, 342, 344, 346, 348, 350, 352, 354, 355, 356,
+    357, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 373, 373, 373, 373, 374,
+    374, 374, 374, 375, 375, 375, 375, 376, 376, 376, 378, 379, 380, 381, 382, 384,
+
+    385, 386, 387, 389, 390, 391, 392, 394, 395, 396, 396, 397, 397, 398, 399, 400, 401, 401, 402, 402, 403,
+    404, 405, 407, 408, 410, 412, 414, 416, 417, 419, 420, 422, 424, 425, 425, 426, 427, 429, 430, 432, 434,
+    435, 437, 437};
+
+static const YY_CHAR yy_ec[256] = {
+    0,  1,  1,  1,  1,  1,  1,  1,  1,  2, 3, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1,  1,
+    1,  1,  1,  1,  1,  1,  2,  1,  4,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  5,  6, 7,  8,
+    9,  10, 11, 5,  12, 5,  13, 14, 1,  1, 1, 1,  1,  15, 16, 17, 18, 19, 20, 21, 22, 23, 1,  1, 24, 25,
+    26, 27, 28, 29, 30, 31, 32, 33, 34, 1, 1, 35, 36, 37, 1,  38, 1,  39, 1,  1,  1,  1,  1,
+
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  40, 1, 41, 1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1,  1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1,  1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1,  1,
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1, 1,  1,
+    1,  1,  1};
+
+static const YY_CHAR yy_meta[42] = {0, 1, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1,
+                                    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+
+static const flex_int16_t yy_base[547] = {
+    0,   0,   0,   41,  0,   610, 611, 81,  83,  611, 0,   611, 611, 56,  599, 580, 575, 611, 611, 611, 611,
+    0,   87,  89,  88,  0,   0,   70,  596, 577, 572, 0,   0,   0,   0,   101, 0,   584, 567, 569, 571, 569,
+    0,   103, 0,   579, 562, 564, 566, 564, 561, 564, 552, 551, 79,  557, 560, 548, 547, 80,  611, 566, 97,
+    87,  569, 560, 0,   563, 117, 90,  566, 557, 611, 549, 99,  552, 550, 557, 560, 546, 541, 118, 549, 556,
+    552, 533, 0,   538, 108, 541, 539, 546, 549, 535, 530, 126, 538, 545, 541, 522, 527,
+
+    531, 536, 523, 520, 522, 532, 518, 534, 95,  518, 528, 510, 524, 611, 525, 513, 517, 522, 509, 506, 508,
+    518, 504, 520, 97,  504, 514, 496, 510, 0,   511, 514, 500, 495, 520, 500, 492, 504, 499, 492, 481, 106,
+    496, 492, 498, 611, 611, 501, 487, 482, 507, 487, 479, 491, 486, 479, 468, 123, 483, 479, 485, 0,   0,
+    468, 475, 462, 611, 611, 470, 460, 464, 464, 126, 470, 126, 480, 611, 611, 459, 466, 453, 0,   0,   461,
+    451, 455, 455, 130, 461, 129, 471, 0,   0,   611, 452, 139, 469, 463, 463, 462,
+
+    158, 165, 459, 446, 450, 461, 0,   443, 141, 460, 454, 454, 453, 172, 179, 450, 437, 441, 452, 441, 435,
+    433, 438, 150, 424, 611, 451, 454, 451, 151, 448, 451, 448, 165, 611, 432, 440, 430, 427, 421, 419, 424,
+    157, 410, 0,   437, 440, 437, 170, 434, 437, 434, 172, 0,   418, 426, 416, 421, 421, 417, 397, 428, 425,
+    180, 177, 183, 186, 414, 413, 190, 192, 193, 412, 411, 405, 411, 408, 408, 408, 404, 384, 415, 412, 201,
+    196, 199, 206, 401, 400, 211, 212, 213, 399, 398, 392, 398, 395, 611, 390, 400,
+
+    380, 215, 217, 388, 382, 384, 381, 220, 223, 225, 387, 386, 385, 384, 383, 382, 611, 611, 381, 380, 379,
+    378, 377, 376, 611, 611, 218, 375, 611, 0,   370, 380, 360, 227, 236, 368, 362, 364, 361, 235, 241, 244,
+    367, 366, 365, 364, 363, 362, 0,   0,   361, 360, 359, 358, 357, 356, 0,   0,   237, 355, 0,   350, 611,
+    366, 352, 351, 350, 349, 352, 333, 338, 332, 336, 335, 335, 338, 332, 336, 331, 155, 334, 611, 611, 611,
+    611, 611, 611, 611, 611, 611, 611, 611, 611, 340, 335, 325, 329, 0,   345, 331,
+
+    330, 329, 328, 331, 312, 317, 311, 315, 314, 314, 317, 311, 315, 310, 168, 313, 0,   0,   0,   0,   0,
+    0,   0,   0,   0,   0,   0,   0,   319, 314, 304, 611, 611, 611, 611, 611, 611, 301, 314, 314, 611, 295,
+    301, 305, 310, 294, 308, 290, 294, 294, 292, 300, 287, 301, 0,   0,   0,   0,   0,   0,   285, 298, 298,
+    0,   279, 285, 289, 294, 278, 292, 274, 278, 278, 276, 284, 271, 285, 611, 275, 266, 281, 275, 611, 265,
+    262, 263, 611, 266, 270, 260, 611, 264, 270, 0,   263, 254, 269, 263, 0,   253,
+
+    250, 251, 0,   254, 258, 247, 0,   249, 255, 253, 611, 247, 611, 611, 611, 611, 249, 611, 234, 611, 611,
+    245, 0,   233, 0,   0,   0,   0,   234, 0,   222, 0,   0,   611, 207, 611, 611, 0,   186, 0,   0,   611,
+    0,   611, 106, 275};
+
+static const flex_int16_t yy_def[547] = {
+    0,   544, 1,   544, 3,   544, 544, 544, 544, 544, 545, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 545, 544, 544, 544, 544, 544,
+    546, 546, 24,  546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 544, 544, 544,
+    544, 544, 544, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544,
+
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544, 544,
+
+    544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544,
+
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546,
+
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546, 546, 546, 546,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 546, 546, 546, 546, 546, 546, 546,
+
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 546, 544, 544, 544, 544, 546, 546, 546, 546, 544,
+    546, 0,   544, 544};
+
+static const flex_int16_t yy_nxt[653] = {
+    0,   6,   7,   8,   9,   10,  10,  10,  10,  10,  10,  10,  10,  11,  12,  6,   6,   13,  6,   6,   6,
+    6,   14,  6,   6,   6,   6,   15,  6,   6,   6,   16,  6,   6,   6,   6,   6,   17,  18,  6,   19,  20,
+    21,  22,  23,  9,   24,  24,  24,  24,  24,  24,  24,  24,  25,  26,  21,  21,  27,  21,  21,  21,  21,
+    28,  21,  21,  21,  21,  29,  21,  21,  21,  30,  21,  21,  21,  21,  21,  31,  32,  21,  33,  34,  35,
+    35,  35,  35,  37,  38,  43,  43,  43,  43,  44,  44,  44,  44,  44,  44,  44,  44,
+
+    45,  46,  35,  35,  43,  43,  64,  70,  36,  65,  71,  73,  141, 74,  157, 75,  76,  82,  83,  77,  96,
+    97,  78,  79,  142, 101, 158, 80,  174, 102, 81,  87,  110, 88,  117, 89,  90,  103, 118, 91,  126, 111,
+    92,  93,  175, 189, 119, 94,  201, 127, 95,  204, 214, 221, 217, 240, 205, 262, 202, 218, 263, 190, 215,
+    227, 282, 228, 268, 283, 229, 230, 231, 222, 232, 241, 269, 233, 234, 246, 449, 247, 273, 450, 248, 249,
+    250, 288, 251, 293, 274, 252, 253, 472, 311, 289, 473, 294, 304, 305, 313, 306,
+
+    312, 315, 307, 308, 543, 319, 314, 321, 323, 316, 309, 343, 310, 320, 345, 322, 324, 336, 337, 344, 338,
+    347, 346, 339, 340, 542, 351, 353, 355, 348, 365, 341, 367, 342, 352, 354, 356, 373, 366, 376, 368, 378,
+    400, 374, 377, 394, 375, 379, 380, 395, 401, 402, 408, 541, 540, 381, 539, 411, 409, 403, 413, 410, 412,
+    538, 429, 537, 414, 415, 430, 536, 535, 534, 533, 532, 416, 42,  531, 42,  530, 529, 528, 527, 526, 525,
+    524, 523, 522, 521, 520, 519, 518, 517, 516, 515, 514, 513, 512, 511, 510, 509,
+
+    508, 507, 506, 505, 504, 503, 502, 501, 500, 499, 498, 497, 496, 495, 494, 493, 492, 491, 490, 489, 488,
+    487, 486, 485, 484, 483, 482, 481, 480, 479, 478, 477, 476, 475, 474, 471, 470, 469, 468, 467, 466, 465,
+    464, 463, 462, 461, 460, 459, 458, 457, 456, 455, 454, 453, 452, 451, 448, 447, 446, 445, 444, 443, 442,
+    441, 440, 439, 438, 437, 436, 435, 434, 433, 432, 431, 428, 427, 426, 425, 424, 423, 422, 421, 420, 419,
+    418, 417, 407, 406, 405, 404, 399, 398, 397, 396, 393, 392, 391, 390, 389, 388,
+
+    387, 386, 385, 384, 383, 382, 372, 371, 370, 369, 364, 363, 362, 361, 360, 359, 358, 357, 350, 349, 335,
+    334, 333, 332, 331, 330, 329, 328, 327, 326, 325, 318, 317, 303, 302, 301, 300, 299, 298, 297, 296, 295,
+    292, 291, 290, 287, 286, 285, 284, 281, 280, 279, 278, 277, 276, 275, 272, 271, 270, 267, 266, 265, 264,
+    261, 260, 259, 258, 257, 256, 255, 254, 245, 244, 243, 242, 239, 238, 237, 236, 235, 226, 225, 224, 223,
+    220, 219, 216, 213, 212, 211, 210, 209, 208, 207, 206, 203, 200, 199, 198, 197,
+
+    196, 195, 194, 193, 192, 191, 188, 187, 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, 176, 173, 172,
+    171, 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, 160, 159, 156, 155, 154, 153, 152, 151, 150, 149,
+    148, 147, 146, 145, 144, 143, 140, 139, 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, 128, 125, 124,
+    123, 122, 121, 120, 116, 115, 114, 113, 112, 109, 108, 107, 106, 105, 104, 100, 99,  98,  86,  85,  84,
+    72,  69,  68,  67,  66,  63,  62,  61,  60,  59,  58,  57,  56,  55,  54,  53,
+
+    52,  51,  50,  49,  48,  47,  41,  40,  39,  544, 5,   544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544};
+
+static const flex_int16_t yy_chk[653] = {
+    0,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+    1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,   1,
+    3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,
+    3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   3,   7,
+    7,   8,   8,   13,  13,  22,  22,  23,  23,  24,  24,  24,  24,  24,  24,  24,  24,
+
+    27,  27,  35,  35,  43,  43,  54,  59,  545, 54,  59,  62,  109, 62,  125, 62,  62,  63,  63,  62,  69,
+    69,  62,  62,  109, 74,  125, 62,  142, 74,  62,  68,  81,  68,  88,  68,  68,  74,  88,  68,  95,  81,
+    68,  68,  142, 158, 88,  68,  173, 95,  68,  175, 188, 196, 190, 209, 175, 224, 173, 190, 224, 158, 188,
+    201, 243, 201, 230, 243, 201, 201, 202, 196, 202, 209, 230, 202, 202, 214, 380, 214, 234, 380, 214, 214,
+    215, 249, 215, 253, 234, 215, 215, 415, 265, 249, 415, 253, 264, 264, 266, 264,
+
+    265, 267, 264, 264, 539, 270, 266, 271, 272, 267, 264, 285, 264, 270, 286, 271, 272, 284, 284, 285, 284,
+    287, 286, 284, 284, 535, 290, 291, 292, 287, 302, 284, 303, 284, 290, 291, 292, 308, 302, 309, 303, 310,
+    334, 308, 309, 327, 308, 310, 310, 327, 334, 335, 340, 531, 529, 310, 524, 341, 340, 335, 342, 340, 341,
+    522, 359, 519, 342, 342, 359, 517, 512, 510, 509, 508, 342, 546, 506, 546, 505, 504, 502, 501, 500, 498,
+    497, 496, 495, 493, 492, 490, 489, 488, 486, 485, 484, 482, 481, 480, 479, 477,
+
+    476, 475, 474, 473, 472, 471, 470, 469, 468, 467, 466, 465, 463, 462, 461, 454, 453, 452, 451, 450, 449,
+    448, 447, 446, 445, 444, 443, 442, 440, 439, 438, 431, 430, 429, 416, 414, 413, 412, 411, 410, 409, 408,
+    407, 406, 405, 404, 403, 402, 401, 400, 399, 397, 396, 395, 394, 381, 379, 378, 377, 376, 375, 374, 373,
+    372, 371, 370, 369, 368, 367, 366, 365, 364, 362, 360, 356, 355, 354, 353, 352, 351, 348, 347, 346, 345,
+    344, 343, 339, 338, 337, 336, 333, 332, 331, 328, 324, 323, 322, 321, 320, 319,
+
+    316, 315, 314, 313, 312, 311, 307, 306, 305, 304, 301, 300, 299, 297, 296, 295, 294, 293, 289, 288, 283,
+    282, 281, 280, 279, 278, 277, 276, 275, 274, 273, 269, 268, 263, 262, 261, 260, 259, 258, 257, 256, 255,
+    252, 251, 250, 248, 247, 246, 244, 242, 241, 240, 239, 238, 237, 236, 233, 232, 231, 229, 228, 227, 225,
+    223, 222, 221, 220, 219, 218, 217, 216, 213, 212, 211, 210, 208, 206, 205, 204, 203, 200, 199, 198, 197,
+    195, 191, 189, 187, 186, 185, 184, 181, 180, 179, 176, 174, 172, 171, 170, 169,
+
+    166, 165, 164, 161, 160, 159, 157, 156, 155, 154, 153, 152, 151, 150, 149, 148, 145, 144, 143, 141, 140,
+    139, 138, 137, 136, 135, 134, 133, 132, 131, 129, 128, 127, 126, 124, 123, 122, 121, 120, 119, 118, 117,
+    116, 115, 113, 112, 111, 110, 108, 107, 106, 105, 104, 103, 102, 101, 100, 99,  98,  97,  96,  94,  93,
+    92,  91,  90,  89,  87,  85,  84,  83,  82,  80,  79,  78,  77,  76,  75,  73,  71,  70,  67,  65,  64,
+    61,  58,  57,  56,  55,  53,  52,  51,  50,  49,  48,  47,  46,  45,  41,  40,
+
+    39,  38,  37,  30,  29,  28,  16,  15,  14,  5,   544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544, 544,
+    544, 544, 544, 544, 544, 544, 544, 544, 544, 544};
 
 extern int yy_flex_debug;
-int yy_flex_debug = 0;
-
-static yy_state_type *yy_state_buf=0, *yy_state_ptr=0;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ \
-yy_cp = (yy_full_match); /* restore poss. backed-over text */ \
-++(yy_lp); \
-goto find_rule; \
-}
+int        yy_flex_debug = 0;
+
+static yy_state_type *yy_state_buf = 0, *yy_state_ptr = 0;
+static char *         yy_full_match;
+static int            yy_lp;
+#define REJECT                                                                                               \
+    {                                                                                                        \
+        *yy_cp = (yy_hold_char);  /* undo effects of setting up yytext */                                    \
+        yy_cp  = (yy_full_match); /* restore poss. backed-over text */                                       \
+        ++(yy_lp);                                                                                           \
+        goto find_rule;                                                                                      \
+    }
 
-#define yymore() yymore_used_but_not_detected
+#define yymore()    yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
@@ -1122,54 +904,54 @@ char *yytext;
 #include "H5LTparse.h"
 
 /* Turn off suggest const & malloc attribute warnings in gcc */
-#if defined __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined            __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__
 #pragma GCC diagnostic ignored "-Wsuggest-attribute=const"
-#endif 
+#endif
 
 /* Turn off null dereference warnings in gcc.
  * We have no control over this generated code.
  */
-#if defined __GNUC__ && 600 <= __GNUC__ * 100
+#if defined            __GNUC__ && 600 <= __GNUC__ * 100
 #pragma GCC diagnostic ignored "-Wnull-dereference"
 #endif
 
 int my_yyinput(char *, int);
 #undef YY_INPUT
-#define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms))
-#define token(x)        (int)x
-#define hid(x)          (hid_t)x
+#define YY_INPUT(b, r, ms) (r = my_yyinput(b, ms))
+#define token(x)           (int)x
+#define hid(x)             (hid_t) x
 
-#ifdef  YY_BUF_SIZE
-#undef  YY_BUF_SIZE
+#ifdef YY_BUF_SIZE
+#undef YY_BUF_SIZE
 #endif
-#define YY_BUF_SIZE        262144    /*Define read buffer to be 256K*/
+#define YY_BUF_SIZE 262144 /*Define read buffer to be 256K*/
 
-extern char *myinput;
+extern char * myinput;
 extern size_t input_len;
 
-#define STACK_SIZE      16
+#define STACK_SIZE 16
 
 /*variables for compound type*/
 struct cmpd_info {
-    hid_t       id;
-    hbool_t         is_field;
-    hbool_t         first_memb;
+    hid_t   id;
+    hbool_t is_field;
+    hbool_t first_memb;
 };
 extern struct cmpd_info cmpd_stack[STACK_SIZE];
-extern int csindex;
+extern int              csindex;
 
 /*variables for array type*/
 struct arr_info {
-    hsize_t             dims[H5S_MAX_RANK];
-    int                 ndim;
-    hbool_t             is_dim;
+    hsize_t dims[H5S_MAX_RANK];
+    int     ndim;
+    hbool_t is_dim;
 };
 extern struct arr_info arr_stack[STACK_SIZE];
-extern int asindex;
+extern int             asindex;
 
 /*variables for enumerate type*/
-extern hbool_t     is_enum;
-extern hbool_t     is_enum_memb;
+extern hbool_t is_enum;
+extern hbool_t is_enum_memb;
 
 /*variables for string type*/
 extern hbool_t is_str_size;
@@ -1178,49 +960,49 @@ extern hbool_t is_str_size;
 extern hbool_t is_opq_size;
 extern hbool_t is_opq_tag;
 
-hbool_t        first_quote = 1;
+hbool_t first_quote = 1;
 
 #line 1162 "hl/src/H5LTanalyze.c"
 
 #line 1164 "hl/src/H5LTanalyze.c"
 
-#define INITIAL 0
+#define INITIAL    0
 #define TAG_STRING 1
 
 #ifndef YY_EXTRA_TYPE
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals ( void );
+static int yy_init_globals(void);
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int yylex_destroy ( void );
+int yylex_destroy(void);
 
-int yyget_debug ( void );
+int yyget_debug(void);
 
-void yyset_debug ( int debug_flag  );
+void yyset_debug(int debug_flag);
 
-YY_EXTRA_TYPE yyget_extra ( void );
+YY_EXTRA_TYPE yyget_extra(void);
 
-void yyset_extra ( YY_EXTRA_TYPE user_defined  );
+void yyset_extra(YY_EXTRA_TYPE user_defined);
 
-FILE *yyget_in ( void );
+FILE *yyget_in(void);
 
-void yyset_in  ( FILE * _in_str  );
+void yyset_in(FILE *_in_str);
 
-FILE *yyget_out ( void );
+FILE *yyget_out(void);
 
-void yyset_out  ( FILE * _out_str  );
+void yyset_out(FILE *_out_str);
 
-			int yyget_leng ( void );
+int yyget_leng(void);
 
-char *yyget_text ( void );
+char *yyget_text(void);
 
-int yyget_lineno ( void );
+int yyget_lineno(void);
 
-void yyset_lineno ( int _line_number  );
+void yyset_lineno(int _line_number);
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1228,31 +1010,31 @@ void yyset_lineno ( int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap ( void );
+extern "C" int yywrap(void);
 #else
-extern int yywrap ( void );
+extern int yywrap(void);
 #endif
 #endif
 
 #ifndef YY_NO_UNPUT
-    
-    static void yyunput ( int c, char *buf_ptr  );
-    
+
+static void yyunput(int c, char *buf_ptr);
+
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy ( char *, const char *, int );
+static void yy_flex_strncpy(char *, const char *, int);
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen ( const char * );
+static int yy_flex_strlen(const char *);
 #endif
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput ( void );
+static int yyinput(void);
 #else
-static int input ( void );
+static int input(void);
 #endif
 
 #endif
@@ -1272,42 +1054,40 @@ static int input ( void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
+#define ECHO                                                                                                 \
+    do {                                                                                                     \
+        if (fwrite(yytext, (size_t)yyleng, 1, yyout)) {                                                      \
+        }                                                                                                    \
+    } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
  * is returned in "result".
  */
 #ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-		{ \
-		int c = '*'; \
-		int n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else \
-		{ \
-		errno=0; \
-		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
-			{ \
-			if( errno != EINTR) \
-				{ \
-				YY_FATAL_ERROR( "input in flex scanner failed" ); \
-				break; \
-				} \
-			errno=0; \
-			clearerr(yyin); \
-			} \
-		}\
-\
+#define YY_INPUT(buf, result, max_size)                                                                      \
+    if (YY_CURRENT_BUFFER_LVALUE->yy_is_interactive) {                                                       \
+        int c = '*';                                                                                         \
+        int n;                                                                                               \
+        for (n = 0; n < max_size && (c = getc(yyin)) != EOF && c != '\n'; ++n)                               \
+            buf[n] = (char)c;                                                                                \
+        if (c == '\n')                                                                                       \
+            buf[n++] = (char)c;                                                                              \
+        if (c == EOF && ferror(yyin))                                                                        \
+            YY_FATAL_ERROR("input in flex scanner failed");                                                  \
+        result = n;                                                                                          \
+    }                                                                                                        \
+    else {                                                                                                   \
+        errno = 0;                                                                                           \
+        while ((result = (int)fread(buf, 1, (yy_size_t)max_size, yyin)) == 0 && ferror(yyin)) {              \
+            if (errno != EINTR) {                                                                            \
+                YY_FATAL_ERROR("input in flex scanner failed");                                              \
+                break;                                                                                       \
+            }                                                                                                \
+            errno = 0;                                                                                       \
+            clearerr(yyin);                                                                                  \
+        }                                                                                                    \
+    }
 
 #endif
 
@@ -1326,7 +1106,7 @@ static int input ( void );
 
 /* Report a fatal error. */
 #ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#define YY_FATAL_ERROR(msg) yy_fatal_error(msg)
 #endif
 
 /* end tables serialization structures and prototypes */
@@ -1337,9 +1117,9 @@ static int input ( void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int yylex (void);
+extern int yylex(void);
 
-#define YY_DECL int yylex (void)
+#define YY_DECL int yylex(void)
 #endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
@@ -1351,609 +1131,714 @@ extern int yylex (void);
 
 /* Code executed at the end of each rule. */
 #ifndef YY_BREAK
-#define YY_BREAK /*LINTED*/break;
+#define YY_BREAK /*LINTED*/ break;
 #endif
 
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
+#define YY_RULE_SETUP YY_USER_ACTION
 
 /** The main scanner function which does all the work.
  */
 YY_DECL
 {
-	yy_state_type yy_current_state;
-	char *yy_cp, *yy_bp;
-	int yy_act;
-    
-	if ( !(yy_init) )
-		{
-		(yy_init) = 1;
+    yy_state_type yy_current_state;
+    char *        yy_cp, *yy_bp;
+    int           yy_act;
+
+    if (!(yy_init)) {
+        (yy_init) = 1;
 
 #ifdef YY_USER_INIT
-		YY_USER_INIT;
+        YY_USER_INIT;
 #endif
 
         /* Create the reject buffer large enough to save one state per allowed character. */
-        if ( ! (yy_state_buf) )
-            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE  );
-            if ( ! (yy_state_buf) )
-                YY_FATAL_ERROR( "out of dynamic memory in yylex()" );
+        if (!(yy_state_buf))
+            (yy_state_buf) = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE);
+        if (!(yy_state_buf))
+            YY_FATAL_ERROR("out of dynamic memory in yylex()");
 
-		if ( ! (yy_start) )
-			(yy_start) = 1;	/* first start state */
+        if (!(yy_start))
+            (yy_start) = 1; /* first start state */
 
-		if ( ! yyin )
-			yyin = stdin;
+        if (!yyin)
+            yyin = stdin;
 
-		if ( ! yyout )
-			yyout = stdout;
+        if (!yyout)
+            yyout = stdout;
 
-		if ( ! YY_CURRENT_BUFFER ) {
-			yyensure_buffer_stack ();
-			YY_CURRENT_BUFFER_LVALUE =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-		}
+        if (!YY_CURRENT_BUFFER) {
+            yyensure_buffer_stack();
+            YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE);
+        }
 
-		yy_load_buffer_state(  );
-		}
+        yy_load_buffer_state();
+    }
 
-	{
+    {
 #line 89 "hl/src/H5LTanalyze.l"
 
-
 #line 1383 "hl/src/H5LTanalyze.c"
 
-	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = (yy_c_buf_p);
+        while (/*CONSTCOND*/ 1) /* loops until end-of-file is reached */
+        {
+            yy_cp = (yy_c_buf_p);
 
-		/* Support of yytext. */
-		*yy_cp = (yy_hold_char);
+            /* Support of yytext. */
+            *yy_cp = (yy_hold_char);
 
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
+            /* yy_bp points to the position in yy_ch_buf of the start of
+             * the current run.
+             */
+            yy_bp = yy_cp;
 
-		yy_current_state = (yy_start);
+            yy_current_state = (yy_start);
 
-		(yy_state_ptr) = (yy_state_buf);
-		*(yy_state_ptr)++ = yy_current_state;
+            (yy_state_ptr)    = (yy_state_buf);
+            *(yy_state_ptr)++ = yy_current_state;
 
 yy_match:
-		do
-			{
-			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 545 )
-					yy_c = yy_meta[yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-			*(yy_state_ptr)++ = yy_current_state;
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 611 );
+            do {
+                YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+                while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state) {
+                    yy_current_state = (int)yy_def[yy_current_state];
+                    if (yy_current_state >= 545)
+                        yy_c = yy_meta[yy_c];
+                }
+                yy_current_state  = yy_nxt[yy_base[yy_current_state] + yy_c];
+                *(yy_state_ptr)++ = yy_current_state;
+                ++yy_cp;
+            } while (yy_base[yy_current_state] != 611);
 
 yy_find_action:
-		yy_current_state = *--(yy_state_ptr);
-		(yy_lp) = yy_accept[yy_current_state];
+            yy_current_state = *--(yy_state_ptr);
+            (yy_lp)          = yy_accept[yy_current_state];
 
 find_rule: /* we branch to this label when backing up */
 
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( (yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[(yy_lp)];
-					{
-					(yy_full_match) = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--(yy_state_ptr);
-			(yy_lp) = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-do_action:	/* This label is used only to access EOF actions. */
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-case 1:
-YY_RULE_SETUP
+            for (;;) /* until we find what rule we matched */
+            {
+                if ((yy_lp) && (yy_lp) < yy_accept[yy_current_state + 1]) {
+                    yy_act = yy_acclist[(yy_lp)];
+                    {
+                        (yy_full_match) = yy_cp;
+                        break;
+                    }
+                }
+                --yy_cp;
+                yy_current_state = *--(yy_state_ptr);
+                (yy_lp)          = yy_accept[yy_current_state];
+            }
+
+            YY_DO_BEFORE_ACTION;
+
+do_action: /* This label is used only to access EOF actions. */
+
+            switch (yy_act) { /* beginning of action switch */
+                case 1:
+                    YY_RULE_SETUP
 #line 91 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I8BE_TOKEN);}
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I8BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 2:
+                    YY_RULE_SETUP
 #line 92 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I8LE_TOKEN);}
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I8LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 3:
+                    YY_RULE_SETUP
 #line 93 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I16BE_TOKEN);}
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I16BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 4:
+                    YY_RULE_SETUP
 #line 94 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I16LE_TOKEN);}
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I16LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 5:
+                    YY_RULE_SETUP
 #line 95 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I32BE_TOKEN);}
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I32BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 6:
+                    YY_RULE_SETUP
 #line 96 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I32LE_TOKEN);}
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I32LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 7:
+                    YY_RULE_SETUP
 #line 97 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I64BE_TOKEN);}
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I64BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 8:
+                    YY_RULE_SETUP
 #line 98 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_I64LE_TOKEN);}
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_I64LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 9:
+                    YY_RULE_SETUP
 #line 100 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U8BE_TOKEN);}
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U8BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 10:
+                    YY_RULE_SETUP
 #line 101 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U8LE_TOKEN);}
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U8LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 11:
+                    YY_RULE_SETUP
 #line 102 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U16BE_TOKEN);}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U16BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 12:
+                    YY_RULE_SETUP
 #line 103 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U16LE_TOKEN);}
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U16LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 13:
+                    YY_RULE_SETUP
 #line 104 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U32BE_TOKEN);}
-	YY_BREAK
-case 14:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U32BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 14:
+                    YY_RULE_SETUP
 #line 105 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U32LE_TOKEN);}
-	YY_BREAK
-case 15:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U32LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 15:
+                    YY_RULE_SETUP
 #line 106 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U64BE_TOKEN);}
-	YY_BREAK
-case 16:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U64BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 16:
+                    YY_RULE_SETUP
 #line 107 "hl/src/H5LTanalyze.l"
-{return hid(H5T_STD_U64LE_TOKEN);}
-	YY_BREAK
-case 17:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_STD_U64LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 17:
+                    YY_RULE_SETUP
 #line 109 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_CHAR_TOKEN);}
-	YY_BREAK
-case 18:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_CHAR_TOKEN);
+                    }
+                    YY_BREAK
+                case 18:
+                    YY_RULE_SETUP
 #line 110 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_SCHAR_TOKEN);}
-	YY_BREAK
-case 19:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_SCHAR_TOKEN);
+                    }
+                    YY_BREAK
+                case 19:
+                    YY_RULE_SETUP
 #line 111 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_UCHAR_TOKEN);}
-	YY_BREAK
-case 20:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_UCHAR_TOKEN);
+                    }
+                    YY_BREAK
+                case 20:
+                    YY_RULE_SETUP
 #line 112 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_SHORT_TOKEN);}
-	YY_BREAK
-case 21:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_SHORT_TOKEN);
+                    }
+                    YY_BREAK
+                case 21:
+                    YY_RULE_SETUP
 #line 113 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_USHORT_TOKEN);}
-	YY_BREAK
-case 22:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_USHORT_TOKEN);
+                    }
+                    YY_BREAK
+                case 22:
+                    YY_RULE_SETUP
 #line 114 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_INT_TOKEN);}
-	YY_BREAK
-case 23:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_INT_TOKEN);
+                    }
+                    YY_BREAK
+                case 23:
+                    YY_RULE_SETUP
 #line 115 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_UINT_TOKEN);}
-	YY_BREAK
-case 24:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_UINT_TOKEN);
+                    }
+                    YY_BREAK
+                case 24:
+                    YY_RULE_SETUP
 #line 116 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_LONG_TOKEN);}
-	YY_BREAK
-case 25:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_LONG_TOKEN);
+                    }
+                    YY_BREAK
+                case 25:
+                    YY_RULE_SETUP
 #line 117 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_ULONG_TOKEN);}
-	YY_BREAK
-case 26:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_ULONG_TOKEN);
+                    }
+                    YY_BREAK
+                case 26:
+                    YY_RULE_SETUP
 #line 118 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_LLONG_TOKEN);}
-	YY_BREAK
-case 27:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_LLONG_TOKEN);
+                    }
+                    YY_BREAK
+                case 27:
+                    YY_RULE_SETUP
 #line 119 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_ULLONG_TOKEN);}
-	YY_BREAK
-case 28:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_ULLONG_TOKEN);
+                    }
+                    YY_BREAK
+                case 28:
+                    YY_RULE_SETUP
 #line 121 "hl/src/H5LTanalyze.l"
-{return hid(H5T_IEEE_F32BE_TOKEN);}
-	YY_BREAK
-case 29:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_IEEE_F32BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 29:
+                    YY_RULE_SETUP
 #line 122 "hl/src/H5LTanalyze.l"
-{return hid(H5T_IEEE_F32LE_TOKEN);}
-	YY_BREAK
-case 30:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_IEEE_F32LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 30:
+                    YY_RULE_SETUP
 #line 123 "hl/src/H5LTanalyze.l"
-{return hid(H5T_IEEE_F64BE_TOKEN);}
-	YY_BREAK
-case 31:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_IEEE_F64BE_TOKEN);
+                    }
+                    YY_BREAK
+                case 31:
+                    YY_RULE_SETUP
 #line 124 "hl/src/H5LTanalyze.l"
-{return hid(H5T_IEEE_F64LE_TOKEN);}
-	YY_BREAK
-case 32:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_IEEE_F64LE_TOKEN);
+                    }
+                    YY_BREAK
+                case 32:
+                    YY_RULE_SETUP
 #line 125 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_FLOAT_TOKEN);}
-	YY_BREAK
-case 33:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_FLOAT_TOKEN);
+                    }
+                    YY_BREAK
+                case 33:
+                    YY_RULE_SETUP
 #line 126 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_DOUBLE_TOKEN);}
-	YY_BREAK
-case 34:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_DOUBLE_TOKEN);
+                    }
+                    YY_BREAK
+                case 34:
+                    YY_RULE_SETUP
 #line 127 "hl/src/H5LTanalyze.l"
-{return hid(H5T_NATIVE_LDOUBLE_TOKEN);}
-	YY_BREAK
-case 35:
-YY_RULE_SETUP
+                    {
+                        return hid(H5T_NATIVE_LDOUBLE_TOKEN);
+                    }
+                    YY_BREAK
+                case 35:
+                    YY_RULE_SETUP
 #line 129 "hl/src/H5LTanalyze.l"
-{return token(H5T_STRING_TOKEN);}
-	YY_BREAK
-case 36:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_STRING_TOKEN);
+                    }
+                    YY_BREAK
+                case 36:
+                    YY_RULE_SETUP
 #line 130 "hl/src/H5LTanalyze.l"
-{return token(STRSIZE_TOKEN);}
-	YY_BREAK
-case 37:
-YY_RULE_SETUP
+                    {
+                        return token(STRSIZE_TOKEN);
+                    }
+                    YY_BREAK
+                case 37:
+                    YY_RULE_SETUP
 #line 131 "hl/src/H5LTanalyze.l"
-{return token(STRPAD_TOKEN);}
-	YY_BREAK
-case 38:
-YY_RULE_SETUP
+                    {
+                        return token(STRPAD_TOKEN);
+                    }
+                    YY_BREAK
+                case 38:
+                    YY_RULE_SETUP
 #line 132 "hl/src/H5LTanalyze.l"
-{return token(CSET_TOKEN);}
-	YY_BREAK
-case 39:
-YY_RULE_SETUP
+                    {
+                        return token(CSET_TOKEN);
+                    }
+                    YY_BREAK
+                case 39:
+                    YY_RULE_SETUP
 #line 133 "hl/src/H5LTanalyze.l"
-{return token(CTYPE_TOKEN);}
-	YY_BREAK
-case 40:
-YY_RULE_SETUP
+                    {
+                        return token(CTYPE_TOKEN);
+                    }
+                    YY_BREAK
+                case 40:
+                    YY_RULE_SETUP
 #line 134 "hl/src/H5LTanalyze.l"
-{return token(H5T_STR_NULLTERM_TOKEN);} 
-	YY_BREAK
-case 41:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_STR_NULLTERM_TOKEN);
+                    }
+                    YY_BREAK
+                case 41:
+                    YY_RULE_SETUP
 #line 135 "hl/src/H5LTanalyze.l"
-{return token(H5T_STR_NULLPAD_TOKEN);} 
-	YY_BREAK
-case 42:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_STR_NULLPAD_TOKEN);
+                    }
+                    YY_BREAK
+                case 42:
+                    YY_RULE_SETUP
 #line 136 "hl/src/H5LTanalyze.l"
-{return token(H5T_STR_SPACEPAD_TOKEN);} 
-	YY_BREAK
-case 43:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_STR_SPACEPAD_TOKEN);
+                    }
+                    YY_BREAK
+                case 43:
+                    YY_RULE_SETUP
 #line 137 "hl/src/H5LTanalyze.l"
-{return token(H5T_CSET_ASCII_TOKEN);}
-	YY_BREAK
-case 44:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_CSET_ASCII_TOKEN);
+                    }
+                    YY_BREAK
+                case 44:
+                    YY_RULE_SETUP
 #line 138 "hl/src/H5LTanalyze.l"
-{return token(H5T_CSET_UTF8_TOKEN);}
-	YY_BREAK
-case 45:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_CSET_UTF8_TOKEN);
+                    }
+                    YY_BREAK
+                case 45:
+                    YY_RULE_SETUP
 #line 139 "hl/src/H5LTanalyze.l"
-{return token(H5T_C_S1_TOKEN);}
-	YY_BREAK
-case 46:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_C_S1_TOKEN);
+                    }
+                    YY_BREAK
+                case 46:
+                    YY_RULE_SETUP
 #line 140 "hl/src/H5LTanalyze.l"
-{return token(H5T_FORTRAN_S1_TOKEN);}
-	YY_BREAK
-case 47:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_FORTRAN_S1_TOKEN);
+                    }
+                    YY_BREAK
+                case 47:
+                    YY_RULE_SETUP
 #line 141 "hl/src/H5LTanalyze.l"
-{return token(H5T_VARIABLE_TOKEN);}
-	YY_BREAK
-case 48:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_VARIABLE_TOKEN);
+                    }
+                    YY_BREAK
+                case 48:
+                    YY_RULE_SETUP
 #line 143 "hl/src/H5LTanalyze.l"
-{return token(H5T_COMPOUND_TOKEN);}
-	YY_BREAK
-case 49:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_COMPOUND_TOKEN);
+                    }
+                    YY_BREAK
+                case 49:
+                    YY_RULE_SETUP
 #line 144 "hl/src/H5LTanalyze.l"
-{return token(H5T_ENUM_TOKEN);}
-	YY_BREAK
-case 50:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_ENUM_TOKEN);
+                    }
+                    YY_BREAK
+                case 50:
+                    YY_RULE_SETUP
 #line 145 "hl/src/H5LTanalyze.l"
-{return token(H5T_ARRAY_TOKEN);}
-	YY_BREAK
-case 51:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_ARRAY_TOKEN);
+                    }
+                    YY_BREAK
+                case 51:
+                    YY_RULE_SETUP
 #line 146 "hl/src/H5LTanalyze.l"
-{return token(H5T_VLEN_TOKEN);}
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_VLEN_TOKEN);
+                    }
+                    YY_BREAK
+                case 52:
+                    YY_RULE_SETUP
 #line 148 "hl/src/H5LTanalyze.l"
-{return token(H5T_OPAQUE_TOKEN);}
-	YY_BREAK
-case 53:
-YY_RULE_SETUP
+                    {
+                        return token(H5T_OPAQUE_TOKEN);
+                    }
+                    YY_BREAK
+                case 53:
+                    YY_RULE_SETUP
 #line 149 "hl/src/H5LTanalyze.l"
-{return token(OPQ_SIZE_TOKEN);}
-	YY_BREAK
-case 54:
-YY_RULE_SETUP
+                    {
+                        return token(OPQ_SIZE_TOKEN);
+                    }
+                    YY_BREAK
+                case 54:
+                    YY_RULE_SETUP
 #line 150 "hl/src/H5LTanalyze.l"
-{return token(OPQ_TAG_TOKEN);}
-	YY_BREAK
-case 55:
-YY_RULE_SETUP
+                    {
+                        return token(OPQ_TAG_TOKEN);
+                    }
+                    YY_BREAK
+                case 55:
+                    YY_RULE_SETUP
 #line 152 "hl/src/H5LTanalyze.l"
-{    
-                        if( is_str_size || (is_enum && is_enum_memb) || 
-                            is_opq_size || (asindex>-1 && arr_stack[asindex].is_dim) ||
-                            (csindex>-1 && cmpd_stack[csindex].is_field) ) {
+                    {
+                        if (is_str_size || (is_enum && is_enum_memb) || is_opq_size ||
+                            (asindex > -1 && arr_stack[asindex].is_dim) ||
+                            (csindex > -1 && cmpd_stack[csindex].is_field)) {
                             H5LTyylval.ival = atoi(yytext);
-                            return NUMBER; 
-                        } else
+                            return NUMBER;
+                        }
+                        else
                             REJECT;
-                 }
-	YY_BREAK
-case 56:
-YY_RULE_SETUP
+                    }
+                    YY_BREAK
+                case 56:
+                    YY_RULE_SETUP
 #line 162 "hl/src/H5LTanalyze.l"
-{
-                    /*if it's first quote, and is a compound field name or an enum symbol*/
-                    if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) 
-                        && first_quote) {
-                        first_quote = 0;
-                        BEGIN TAG_STRING;
-                    } else /*if it's second quote*/
-                        first_quote = 1;
-                    return token('"');
-                 }
-	YY_BREAK
-case 57:
-/* rule 57 can match eol */
-YY_RULE_SETUP
+                    {
+                        /*if it's first quote, and is a compound field name or an enum symbol*/
+                        if ((is_opq_tag || is_enum || (csindex > -1 && cmpd_stack[csindex].is_field)) &&
+                            first_quote) {
+                            first_quote = 0;
+                            BEGIN TAG_STRING;
+                        }
+                        else /*if it's second quote*/
+                            first_quote = 1;
+                        return token('"');
+                    }
+                    YY_BREAK
+                case 57:
+                    /* rule 57 can match eol */
+                    YY_RULE_SETUP
 #line 172 "hl/src/H5LTanalyze.l"
-{
+                    {
 #ifdef H5_HAVE_WIN32_API
-                    H5LTyylval.sval = _strdup(yytext);
-#else /* H5_HAVE_WIN32_API */
-                    H5LTyylval.sval = strdup(yytext);
-#endif  /* H5_HAVE_WIN32_API */
-                    BEGIN INITIAL;
-                    return STRING;
-                 }
-	YY_BREAK
-case 58:
-YY_RULE_SETUP
+                        H5LTyylval.sval = _strdup(yytext);
+#else  /* H5_HAVE_WIN32_API */
+                        H5LTyylval.sval = strdup(yytext);
+#endif /* H5_HAVE_WIN32_API */
+                        BEGIN INITIAL;
+                        return STRING;
+                    }
+                    YY_BREAK
+                case 58:
+                    YY_RULE_SETUP
 #line 182 "hl/src/H5LTanalyze.l"
-{return token('{');}
-	YY_BREAK
-case 59:
-YY_RULE_SETUP
+                    {
+                        return token('{');
+                    }
+                    YY_BREAK
+                case 59:
+                    YY_RULE_SETUP
 #line 183 "hl/src/H5LTanalyze.l"
-{return token('}');}
-	YY_BREAK
-case 60:
-YY_RULE_SETUP
+                    {
+                        return token('}');
+                    }
+                    YY_BREAK
+                case 60:
+                    YY_RULE_SETUP
 #line 184 "hl/src/H5LTanalyze.l"
-{return token('[');}
-	YY_BREAK
-case 61:
-YY_RULE_SETUP
+                    {
+                        return token('[');
+                    }
+                    YY_BREAK
+                case 61:
+                    YY_RULE_SETUP
 #line 185 "hl/src/H5LTanalyze.l"
-{return token(']');}
-	YY_BREAK
-case 62:
-YY_RULE_SETUP
+                    {
+                        return token(']');
+                    }
+                    YY_BREAK
+                case 62:
+                    YY_RULE_SETUP
 #line 186 "hl/src/H5LTanalyze.l"
-{return token(':');}
-	YY_BREAK
-case 63:
-YY_RULE_SETUP
+                    {
+                        return token(':');
+                    }
+                    YY_BREAK
+                case 63:
+                    YY_RULE_SETUP
 #line 187 "hl/src/H5LTanalyze.l"
-{return token(';');}
-	YY_BREAK
-case 64:
-/* rule 64 can match eol */
-YY_RULE_SETUP
+                    {
+                        return token(';');
+                    }
+                    YY_BREAK
+                case 64:
+                    /* rule 64 can match eol */
+                    YY_RULE_SETUP
 #line 188 "hl/src/H5LTanalyze.l"
-;
-	YY_BREAK
-case 65:
-/* rule 65 can match eol */
-YY_RULE_SETUP
+                        ;
+                    YY_BREAK
+                case 65:
+                    /* rule 65 can match eol */
+                    YY_RULE_SETUP
 #line 189 "hl/src/H5LTanalyze.l"
-{ return 0; }
-	YY_BREAK
-case 66:
-YY_RULE_SETUP
+                    {
+                        return 0;
+                    }
+                    YY_BREAK
+                case 66:
+                    YY_RULE_SETUP
 #line 191 "hl/src/H5LTanalyze.l"
-ECHO;
-	YY_BREAK
+                    ECHO;
+                    YY_BREAK
 #line 1803 "hl/src/H5LTanalyze.c"
-			case YY_STATE_EOF(INITIAL):
-			case YY_STATE_EOF(TAG_STRING):
-				yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = (yy_hold_char);
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between YY_CURRENT_BUFFER and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state(  );
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++(yy_c_buf_p);
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = (yy_c_buf_p);
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer(  ) )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				(yy_did_buffer_switch_on_eof) = 0;
-
-				if ( yywrap(  ) )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				(yy_c_buf_p) =
-					(yytext_ptr) + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				(yy_c_buf_p) =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-				yy_current_state = yy_get_previous_state(  );
-
-				yy_cp = (yy_c_buf_p);
-				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of user's declarations */
+                case YY_STATE_EOF(INITIAL):
+                case YY_STATE_EOF(TAG_STRING):
+                    yyterminate();
+
+                case YY_END_OF_BUFFER: {
+                    /* Amount of text matched not including the EOB char. */
+                    int yy_amount_of_matched_text = (int)(yy_cp - (yytext_ptr)) - 1;
+
+                    /* Undo the effects of YY_DO_BEFORE_ACTION. */
+                    *yy_cp = (yy_hold_char);
+                    YY_RESTORE_YY_MORE_OFFSET
+
+                    if (YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW) {
+                        /* We're scanning a new file or input source.  It's
+                         * possible that this happened because the user
+                         * just pointed yyin at a new source and called
+                         * yylex().  If so, then we have to assure
+                         * consistency between YY_CURRENT_BUFFER and our
+                         * globals.  Here is the right place to do so, because
+                         * this is the first action (other than possibly a
+                         * back-up) that will match for the new input source.
+                         */
+                        (yy_n_chars)                               = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+                        YY_CURRENT_BUFFER_LVALUE->yy_input_file    = yyin;
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+                    }
+
+                    /* Note that here we test for yy_c_buf_p "<=" to the position
+                     * of the first EOB in the buffer, since yy_c_buf_p will
+                     * already have been incremented past the NUL character
+                     * (since all states make transitions on EOB to the
+                     * end-of-buffer state).  Contrast this with the test
+                     * in input().
+                     */
+                    if ((yy_c_buf_p) <=
+                        &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]) { /* This was really a NUL. */
+                        yy_state_type yy_next_state;
+
+                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                        yy_current_state = yy_get_previous_state();
+
+                        /* Okay, we're now positioned to make the NUL
+                         * transition.  We couldn't have
+                         * yy_get_previous_state() go ahead and do it
+                         * for us because it doesn't know how to deal
+                         * with the possibility of jamming (and we don't
+                         * want to build jamming into it because then it
+                         * will run more slowly).
+                         */
+
+                        yy_next_state = yy_try_NUL_trans(yy_current_state);
+
+                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+                        if (yy_next_state) {
+                            /* Consume the NUL. */
+                            yy_cp            = ++(yy_c_buf_p);
+                            yy_current_state = yy_next_state;
+                            goto yy_match;
+                        }
+
+                        else {
+                            yy_cp = (yy_c_buf_p);
+                            goto yy_find_action;
+                        }
+                    }
+
+                    else
+                        switch (yy_get_next_buffer()) {
+                            case EOB_ACT_END_OF_FILE: {
+                                (yy_did_buffer_switch_on_eof) = 0;
+
+                                if (yywrap()) {
+                                    /* Note: because we've taken care in
+                                     * yy_get_next_buffer() to have set up
+                                     * yytext, we can now set up
+                                     * yy_c_buf_p so that if some total
+                                     * hoser (like flex itself) wants to
+                                     * call the scanner after we return the
+                                     * YY_NULL, it'll still work - another
+                                     * YY_NULL will get returned.
+                                     */
+                                    (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+                                    yy_act = YY_STATE_EOF(YY_START);
+                                    goto do_action;
+                                }
+
+                                else {
+                                    if (!(yy_did_buffer_switch_on_eof))
+                                        YY_NEW_FILE;
+                                }
+                                break;
+                            }
+
+                            case EOB_ACT_CONTINUE_SCAN:
+                                (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                                yy_current_state = yy_get_previous_state();
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                                goto yy_match;
+
+                            case EOB_ACT_LAST_MATCH:
+                                (yy_c_buf_p) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+                                yy_current_state = yy_get_previous_state();
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                                goto yy_find_action;
+                        }
+                    break;
+                }
+
+                default:
+                    YY_FATAL_ERROR("fatal flex scanner internal error--no action found");
+            } /* end of action switch */
+        }     /* end of scanning one token */
+    }         /* end of user's declarations */
 } /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1963,138 +1848,125 @@ ECHO;
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-static int yy_get_next_buffer (void)
+static int
+yy_get_next_buffer(void)
 {
-    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	char *source = (yytext_ptr);
-	int number_to_move, i;
-	int ret_val;
-
-	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-	else
-		{
-			int num_to_read =
-			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
-
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	if ( (yy_n_chars) == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin  );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
-			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-		/* "- 2" to take care of EOB's */
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
-	}
-
-	(yy_n_chars) += number_to_move;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-	return ret_val;
+    char *dest   = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+    char *source = (yytext_ptr);
+    int   number_to_move, i;
+    int   ret_val;
+
+    if ((yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1])
+        YY_FATAL_ERROR("fatal flex scanner internal error--end of buffer missed");
+
+    if (YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer ==
+        0) { /* Don't try to fill the buffer, so this is an EOF. */
+        if ((yy_c_buf_p) - (yytext_ptr)-YY_MORE_ADJ == 1) {
+            /* We matched a single character, the EOB, so
+             * treat this as a final EOF.
+             */
+            return EOB_ACT_END_OF_FILE;
+        }
+
+        else {
+            /* We matched some text prior to the EOB, first
+             * process it.
+             */
+            return EOB_ACT_LAST_MATCH;
+        }
+    }
+
+    /* Try to read more data. */
+
+    /* First move last chars to start of buffer. */
+    number_to_move = (int)((yy_c_buf_p) - (yytext_ptr)-1);
+
+    for (i = 0; i < number_to_move; ++i)
+        *(dest++) = *(source++);
+
+    if (YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING)
+        /* don't do the read, it's not guaranteed to return an EOF,
+         * just force an EOF
+         */
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+    else {
+        int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+        while (num_to_read <= 0) { /* Not enough room in the buffer - grow it. */
+
+            YY_FATAL_ERROR("input buffer overflow, can't enlarge buffer because scanner uses REJECT");
+        }
+
+        if (num_to_read > YY_READ_BUF_SIZE)
+            num_to_read = YY_READ_BUF_SIZE;
+
+        /* Read in more data. */
+        YY_INPUT((&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), (yy_n_chars), num_to_read);
+
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+    }
+
+    if ((yy_n_chars) == 0) {
+        if (number_to_move == YY_MORE_ADJ) {
+            ret_val = EOB_ACT_END_OF_FILE;
+            yyrestart(yyin);
+        }
+
+        else {
+            ret_val                                    = EOB_ACT_LAST_MATCH;
+            YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING;
+        }
+    }
+
+    else
+        ret_val = EOB_ACT_CONTINUE_SCAN;
+
+    if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+        /* Extend the array by 50%, plus the number we really need. */
+        int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf =
+            (char *)yyrealloc((void *)YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t)new_size);
+        if (!YY_CURRENT_BUFFER_LVALUE->yy_ch_buf)
+            YY_FATAL_ERROR("out of dynamic memory in yy_get_next_buffer()");
+        /* "- 2" to take care of EOB's */
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int)(new_size - 2);
+    }
+
+    (yy_n_chars) += number_to_move;
+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]     = YY_END_OF_BUFFER_CHAR;
+    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+    (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+    return ret_val;
 }
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-    static yy_state_type yy_get_previous_state (void)
+static yy_state_type
+yy_get_previous_state(void)
 {
-	yy_state_type yy_current_state;
-	char *yy_cp;
-    
-	yy_current_state = (yy_start);
-
-	(yy_state_ptr) = (yy_state_buf);
-	*(yy_state_ptr)++ = yy_current_state;
-
-	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-		{
-		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 545 )
-				yy_c = yy_meta[yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-		*(yy_state_ptr)++ = yy_current_state;
-		}
-
-	return yy_current_state;
+    yy_state_type yy_current_state;
+    char *        yy_cp;
+
+    yy_current_state = (yy_start);
+
+    (yy_state_ptr)    = (yy_state_buf);
+    *(yy_state_ptr)++ = yy_current_state;
+
+    for (yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp) {
+        YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+        while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state) {
+            yy_current_state = (int)yy_def[yy_current_state];
+            if (yy_current_state >= 545)
+                yy_c = yy_meta[yy_c];
+        }
+        yy_current_state  = yy_nxt[yy_base[yy_current_state] + yy_c];
+        *(yy_state_ptr)++ = yy_current_state;
+    }
+
+    return yy_current_state;
 }
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
@@ -2102,617 +1974,627 @@ static int yy_get_next_buffer (void)
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+static yy_state_type
+yy_try_NUL_trans(yy_state_type yy_current_state)
 {
-	int yy_is_jam;
-    
-	YY_CHAR yy_c = 1;
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 545 )
-			yy_c = yy_meta[yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 544);
-	if ( ! yy_is_jam )
-		*(yy_state_ptr)++ = yy_current_state;
-
-		return yy_is_jam ? 0 : yy_current_state;
+    int yy_is_jam;
+
+    YY_CHAR yy_c = 1;
+    while (yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state) {
+        yy_current_state = (int)yy_def[yy_current_state];
+        if (yy_current_state >= 545)
+            yy_c = yy_meta[yy_c];
+    }
+    yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
+    yy_is_jam        = (yy_current_state == 544);
+    if (!yy_is_jam)
+        *(yy_state_ptr)++ = yy_current_state;
+
+    return yy_is_jam ? 0 : yy_current_state;
 }
 
 #ifndef YY_NO_UNPUT
 
-    static void yyunput (int c, char * yy_bp )
+static void
+yyunput(int c, char *yy_bp)
 {
-	char *yy_cp;
-    
+    char *yy_cp;
+
     yy_cp = (yy_c_buf_p);
 
-	/* undo effects of setting up yytext */
-	*yy_cp = (yy_hold_char);
+    /* undo effects of setting up yytext */
+    *yy_cp = (yy_hold_char);
 
-	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		int number_to_move = (yy_n_chars) + 2;
-		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-		char *source =
-				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+    if (yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2) { /* need to shift things up to make room */
+        /* +2 for EOB chars. */
+        int   number_to_move = (yy_n_chars) + 2;
+        char *dest   = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+        char *source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			*--dest = *--source;
+        while (source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf)
+            *--dest = *--source;
 
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-			(yy_n_chars) = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+        yy_cp += (int)(dest - source);
+        yy_bp += (int)(dest - source);
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = (int)YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
+        if (yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2)
+            YY_FATAL_ERROR("flex scanner push-back overflow");
+    }
 
-	*--yy_cp = (char) c;
+    *--yy_cp = (char)c;
 
-	(yytext_ptr) = yy_bp;
-	(yy_hold_char) = *yy_cp;
-	(yy_c_buf_p) = yy_cp;
+    (yytext_ptr)   = yy_bp;
+    (yy_hold_char) = *yy_cp;
+    (yy_c_buf_p)   = yy_cp;
 }
 
 #endif
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-    static int yyinput (void)
+static int
+yyinput(void)
 #else
-    static int input  (void)
+static int
+input(void)
 #endif
 
 {
-	int c;
-    
-	*(yy_c_buf_p) = (yy_hold_char);
-
-	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-			/* This was really a NUL. */
-			*(yy_c_buf_p) = '\0';
-
-		else
-			{ /* need more input */
-			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
-			++(yy_c_buf_p);
-
-			switch ( yy_get_next_buffer(  ) )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/*FALLTHROUGH*/
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap(  ) )
-						return 0;
-
-					if ( ! (yy_did_buffer_switch_on_eof) )
-						YY_NEW_FILE;
+    int c;
+
+    *(yy_c_buf_p) = (yy_hold_char);
+
+    if (*(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR) {
+        /* yy_c_buf_p now points to the character we want to return.
+         * If this occurs *before* the EOB characters, then it's a
+         * valid NUL; if not, then we've hit the end of the buffer.
+         */
+        if ((yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)])
+            /* This was really a NUL. */
+            *(yy_c_buf_p) = '\0';
+
+        else { /* need more input */
+            int offset = (int)((yy_c_buf_p) - (yytext_ptr));
+            ++(yy_c_buf_p);
+
+            switch (yy_get_next_buffer()) {
+                case EOB_ACT_LAST_MATCH:
+                    /* This happens because yy_g_n_b()
+                     * sees that we've accumulated a
+                     * token and flags that we need to
+                     * try matching the token before
+                     * proceeding.  But for input(),
+                     * there's no matching to consider.
+                     * So convert the EOB_ACT_LAST_MATCH
+                     * to EOB_ACT_END_OF_FILE.
+                     */
+
+                    /* Reset buffer status. */
+                    yyrestart(yyin);
+
+                    /*FALLTHROUGH*/
+
+                case EOB_ACT_END_OF_FILE: {
+                    if (yywrap())
+                        return 0;
+
+                    if (!(yy_did_buffer_switch_on_eof))
+                        YY_NEW_FILE;
 #ifdef __cplusplus
-					return yyinput();
+                    return yyinput();
 #else
-					return input();
+                    return input();
 #endif
-					}
+                }
 
-				case EOB_ACT_CONTINUE_SCAN:
-					(yy_c_buf_p) = (yytext_ptr) + offset;
-					break;
-				}
-			}
-		}
+                case EOB_ACT_CONTINUE_SCAN:
+                    (yy_c_buf_p) = (yytext_ptr) + offset;
+                    break;
+            }
+        }
+    }
 
-	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve yytext */
-	(yy_hold_char) = *++(yy_c_buf_p);
+    c              = *(unsigned char *)(yy_c_buf_p); /* cast for 8-bit char's */
+    *(yy_c_buf_p)  = '\0';                           /* preserve yytext */
+    (yy_hold_char) = *++(yy_c_buf_p);
 
-	return c;
+    return c;
 }
-#endif	/* ifndef YY_NO_INPUT */
+#endif /* ifndef YY_NO_INPUT */
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
- * 
+ *
  * @note This function does not reset the start condition to @c INITIAL .
  */
-    void yyrestart  (FILE * input_file )
+void
+yyrestart(FILE *input_file)
 {
-    
-	if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-		YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer( yyin, YY_BUF_SIZE );
-	}
-
-	yy_init_buffer( YY_CURRENT_BUFFER, input_file );
-	yy_load_buffer_state(  );
+
+    if (!YY_CURRENT_BUFFER) {
+        yyensure_buffer_stack();
+        YY_CURRENT_BUFFER_LVALUE = yy_create_buffer(yyin, YY_BUF_SIZE);
+    }
+
+    yy_init_buffer(YY_CURRENT_BUFFER, input_file);
+    yy_load_buffer_state();
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
- * 
+ *
  */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+void
+yy_switch_to_buffer(YY_BUFFER_STATE new_buffer)
 {
-    
-	/* TODO. We should be able to replace this entire function body
-	 * with
-	 *		yypop_buffer_state();
-	 *		yypush_buffer_state(new_buffer);
+
+    /* TODO. We should be able to replace this entire function body
+     * with
+     *		yypop_buffer_state();
+     *		yypush_buffer_state(new_buffer);
+     */
+    yyensure_buffer_stack();
+    if (YY_CURRENT_BUFFER == new_buffer)
+        return;
+
+    if (YY_CURRENT_BUFFER) {
+        /* Flush out information for old buffer. */
+        *(yy_c_buf_p)                        = (yy_hold_char);
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+    }
+
+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
+    yy_load_buffer_state();
+
+    /* We don't actually know whether we did this switch during
+     * EOF (yywrap()) processing, but the only time this flag
+     * is looked at is after yywrap() is called, so it's safe
+     * to go ahead and always set it.
      */
-	yyensure_buffer_stack ();
-	if ( YY_CURRENT_BUFFER == new_buffer )
-		return;
-
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	yy_load_buffer_state(  );
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	(yy_did_buffer_switch_on_eof) = 1;
+    (yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void yy_load_buffer_state  (void)
+static void
+yy_load_buffer_state(void)
 {
-    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-	(yy_hold_char) = *(yy_c_buf_p);
+    (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+    (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+    yyin                        = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+    (yy_hold_char)              = *(yy_c_buf_p);
 }
 
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
+ *
  * @return the allocated buffer state.
  */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+YY_BUFFER_STATE
+yy_create_buffer(FILE *file, int size)
 {
-	YY_BUFFER_STATE b;
-    
-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+    YY_BUFFER_STATE b;
 
-	b->yy_buf_size = size;
+    b = (YY_BUFFER_STATE)yyalloc(sizeof(struct yy_buffer_state));
+    if (!b)
+        YY_FATAL_ERROR("out of dynamic memory in yy_create_buffer()");
 
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+    b->yy_buf_size = size;
+
+    /* yy_ch_buf has to be 2 characters longer than the size given because
+     * we need to put in 2 end-of-buffer characters.
+     */
+    b->yy_ch_buf = (char *)yyalloc((yy_size_t)(b->yy_buf_size + 2));
+    if (!b->yy_ch_buf)
+        YY_FATAL_ERROR("out of dynamic memory in yy_create_buffer()");
 
-	b->yy_is_our_buffer = 1;
+    b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+    yy_init_buffer(b, file);
 
-	return b;
+    return b;
 }
 
 /** Destroy the buffer.
  * @param b a buffer created with yy_create_buffer()
- * 
+ *
  */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
+void
+yy_delete_buffer(YY_BUFFER_STATE b)
 {
-    
-	if ( ! b )
-		return;
 
-	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+    if (!b)
+        return;
+
+    if (b == YY_CURRENT_BUFFER) /* Not sure if we should pop here. */
+        YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE)0;
 
-	if ( b->yy_is_our_buffer )
-		yyfree( (void *) b->yy_ch_buf  );
+    if (b->yy_is_our_buffer)
+        yyfree((void *)b->yy_ch_buf);
 
-	yyfree( (void *) b  );
+    yyfree((void *)b);
 }
 
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a yyrestart() or at EOF.
  */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+static void
+yy_init_buffer(YY_BUFFER_STATE b, FILE *file)
 
 {
-	int oerrno = errno;
-    
-	yy_flush_buffer( b );
+    int oerrno = errno;
+
+    yy_flush_buffer(b);
 
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
+    b->yy_input_file  = file;
+    b->yy_fill_buffer = 1;
 
     /* If b is the current buffer, then yy_init_buffer was _probably_
      * called from yyrestart() or through yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
-    if (b != YY_CURRENT_BUFFER){
+    if (b != YY_CURRENT_BUFFER) {
         b->yy_bs_lineno = 1;
         b->yy_bs_column = 0;
     }
 
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-	errno = oerrno;
+    b->yy_is_interactive = file ? (isatty(fileno(file)) > 0) : 0;
+
+    errno = oerrno;
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
+ *
  */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
+void
+yy_flush_buffer(YY_BUFFER_STATE b)
 {
-    	if ( ! b )
-		return;
+    if (!b)
+        return;
 
-	b->yy_n_chars = 0;
+    b->yy_n_chars = 0;
 
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+    /* We always need two end-of-buffer characters.  The first causes
+     * a transition to the end-of-buffer state.  The second causes
+     * a jam in that state.
+     */
+    b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+    b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
 
-	b->yy_buf_pos = &b->yy_ch_buf[0];
+    b->yy_buf_pos = &b->yy_ch_buf[0];
 
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
+    b->yy_at_bol        = 1;
+    b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == YY_CURRENT_BUFFER )
-		yy_load_buffer_state(  );
+    if (b == YY_CURRENT_BUFFER)
+        yy_load_buffer_state();
 }
 
 /** Pushes the new state onto the stack. The new state becomes
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
- *  
+ *
  */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+void
+yypush_buffer_state(YY_BUFFER_STATE new_buffer)
 {
-    	if (new_buffer == NULL)
-		return;
-
-	yyensure_buffer_stack();
-
-	/* This block is copied from yy_switch_to_buffer. */
-	if ( YY_CURRENT_BUFFER )
-		{
-		/* Flush out information for old buffer. */
-		*(yy_c_buf_p) = (yy_hold_char);
-		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-		}
-
-	/* Only push if top exists. Otherwise, replace top. */
-	if (YY_CURRENT_BUFFER)
-		(yy_buffer_stack_top)++;
-	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-	/* copied from yy_switch_to_buffer. */
-	yy_load_buffer_state(  );
-	(yy_did_buffer_switch_on_eof) = 1;
+    if (new_buffer == NULL)
+        return;
+
+    yyensure_buffer_stack();
+
+    /* This block is copied from yy_switch_to_buffer. */
+    if (YY_CURRENT_BUFFER) {
+        /* Flush out information for old buffer. */
+        *(yy_c_buf_p)                        = (yy_hold_char);
+        YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+        YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+    }
+
+    /* Only push if top exists. Otherwise, replace top. */
+    if (YY_CURRENT_BUFFER)
+        (yy_buffer_stack_top)++;
+    YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+    /* copied from yy_switch_to_buffer. */
+    yy_load_buffer_state();
+    (yy_did_buffer_switch_on_eof) = 1;
 }
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
- *  
+ *
  */
-void yypop_buffer_state (void)
+void
+yypop_buffer_state(void)
 {
-    	if (!YY_CURRENT_BUFFER)
-		return;
-
-	yy_delete_buffer(YY_CURRENT_BUFFER );
-	YY_CURRENT_BUFFER_LVALUE = NULL;
-	if ((yy_buffer_stack_top) > 0)
-		--(yy_buffer_stack_top);
-
-	if (YY_CURRENT_BUFFER) {
-		yy_load_buffer_state(  );
-		(yy_did_buffer_switch_on_eof) = 1;
-	}
+    if (!YY_CURRENT_BUFFER)
+        return;
+
+    yy_delete_buffer(YY_CURRENT_BUFFER);
+    YY_CURRENT_BUFFER_LVALUE = NULL;
+    if ((yy_buffer_stack_top) > 0)
+        --(yy_buffer_stack_top);
+
+    if (YY_CURRENT_BUFFER) {
+        yy_load_buffer_state();
+        (yy_did_buffer_switch_on_eof) = 1;
+    }
 }
 
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void yyensure_buffer_stack (void)
+static void
+yyensure_buffer_stack(void)
 {
-	yy_size_t num_to_alloc;
-    
-	if (!(yy_buffer_stack)) {
+    yy_size_t num_to_alloc;
+
+    if (!(yy_buffer_stack)) {
 
-		/* First allocation is just for 2 elements, since we don't know if this
-		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-		 * immediate realloc on the next call.
+        /* First allocation is just for 2 elements, since we don't know if this
+         * scanner will even need a stack. We use 2 instead of 1 to avoid an
+         * immediate realloc on the next call.
          */
-      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-								(num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
-		(yy_buffer_stack_max) = num_to_alloc;
-		(yy_buffer_stack_top) = 0;
-		return;
-	}
-
-	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-		/* Increase the buffer to prepare for a possible push. */
-		yy_size_t grow_size = 8 /* arbitrary grow size */;
-
-		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-								((yy_buffer_stack),
-								num_to_alloc * sizeof(struct yy_buffer_state*)
-								);
-		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-
-		/* zero only the new slots.*/
-		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-		(yy_buffer_stack_max) = num_to_alloc;
-	}
+        num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+        (yy_buffer_stack) =
+            (struct yy_buffer_state **)yyalloc(num_to_alloc * sizeof(struct yy_buffer_state *));
+        if (!(yy_buffer_stack))
+            YY_FATAL_ERROR("out of dynamic memory in yyensure_buffer_stack()");
+
+        memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state *));
+
+        (yy_buffer_stack_max) = num_to_alloc;
+        (yy_buffer_stack_top) = 0;
+        return;
+    }
+
+    if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1) {
+
+        /* Increase the buffer to prepare for a possible push. */
+        yy_size_t grow_size = 8 /* arbitrary grow size */;
+
+        num_to_alloc      = (yy_buffer_stack_max) + grow_size;
+        (yy_buffer_stack) = (struct yy_buffer_state **)yyrealloc(
+            (yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state *));
+        if (!(yy_buffer_stack))
+            YY_FATAL_ERROR("out of dynamic memory in yyensure_buffer_stack()");
+
+        /* zero only the new slots.*/
+        memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state *));
+        (yy_buffer_stack_max) = num_to_alloc;
+    }
 }
 
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
- * 
+ *
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+YY_BUFFER_STATE
+yy_scan_buffer(char *base, yy_size_t size)
 {
-	YY_BUFFER_STATE b;
-    
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return NULL;
-
-	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = NULL;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b  );
-
-	return b;
+    YY_BUFFER_STATE b;
+
+    if (size < 2 || base[size - 2] != YY_END_OF_BUFFER_CHAR || base[size - 1] != YY_END_OF_BUFFER_CHAR)
+        /* They forgot to leave room for the EOB's. */
+        return NULL;
+
+    b = (YY_BUFFER_STATE)yyalloc(sizeof(struct yy_buffer_state));
+    if (!b)
+        YY_FATAL_ERROR("out of dynamic memory in yy_scan_buffer()");
+
+    b->yy_buf_size = (int)(size - 2); /* "- 2" to take care of EOB's */
+    b->yy_buf_pos = b->yy_ch_buf = base;
+    b->yy_is_our_buffer          = 0;
+    b->yy_input_file             = NULL;
+    b->yy_n_chars                = b->yy_buf_size;
+    b->yy_is_interactive         = 0;
+    b->yy_at_bol                 = 1;
+    b->yy_fill_buffer            = 0;
+    b->yy_buffer_status          = YY_BUFFER_NEW;
+
+    yy_switch_to_buffer(b);
+
+    return b;
 }
 
 /** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
- * 
+ *
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE yy_scan_string (const char * yystr )
+YY_BUFFER_STATE
+yy_scan_string(const char *yystr)
 {
-    
-	return yy_scan_bytes( yystr, (int) strlen(yystr) );
+
+    return yy_scan_bytes(yystr, (int)strlen(yystr));
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
+ *
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
+YY_BUFFER_STATE
+yy_scan_bytes(const char *yybytes, int _yybytes_len)
 {
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-    
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = (yy_size_t) (_yybytes_len + 2);
-	buf = (char *) yyalloc( n  );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < _yybytes_len; ++i )
-		buf[i] = yybytes[i];
-
-	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
+    YY_BUFFER_STATE b;
+    char *          buf;
+    yy_size_t       n;
+    int             i;
+
+    /* Get memory for full buffer, including space for trailing EOB's. */
+    n   = (yy_size_t)(_yybytes_len + 2);
+    buf = (char *)yyalloc(n);
+    if (!buf)
+        YY_FATAL_ERROR("out of dynamic memory in yy_scan_bytes()");
+
+    for (i = 0; i < _yybytes_len; ++i)
+        buf[i] = yybytes[i];
+
+    buf[_yybytes_len] = buf[_yybytes_len + 1] = YY_END_OF_BUFFER_CHAR;
+
+    b = yy_scan_buffer(buf, n);
+    if (!b)
+        YY_FATAL_ERROR("bad buffer in yy_scan_bytes()");
+
+    /* It's okay to grow etc. this buffer, and we should throw it
+     * away when we're done.
+     */
+    b->yy_is_our_buffer = 1;
+
+    return b;
 }
 
 #ifndef YY_EXIT_FAILURE
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yynoreturn yy_fatal_error (const char* msg )
+static void yynoreturn
+yy_fatal_error(const char *msg)
 {
-			fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+    fprintf(stderr, "%s\n", msg);
+    exit(YY_EXIT_FAILURE);
 }
 
 /* Redefine yyless() so it works in section 3 code. */
 
 #undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-		yytext[yyleng] = (yy_hold_char); \
-		(yy_c_buf_p) = yytext + yyless_macro_arg; \
-		(yy_hold_char) = *(yy_c_buf_p); \
-		*(yy_c_buf_p) = '\0'; \
-		yyleng = yyless_macro_arg; \
-		} \
-	while ( 0 )
+#define yyless(n)                                                                                            \
+    do {                                                                                                     \
+        /* Undo effects of setting up yytext. */                                                             \
+        int yyless_macro_arg = (n);                                                                          \
+        YY_LESS_LINENO(yyless_macro_arg);                                                                    \
+        yytext[yyleng] = (yy_hold_char);                                                                     \
+        (yy_c_buf_p)   = yytext + yyless_macro_arg;                                                          \
+        (yy_hold_char) = *(yy_c_buf_p);                                                                      \
+        *(yy_c_buf_p)  = '\0';                                                                               \
+        yyleng         = yyless_macro_arg;                                                                   \
+    } while (0)
 
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
- * 
+ *
  */
-int yyget_lineno  (void)
+int
+yyget_lineno(void)
 {
-    
+
     return yylineno;
 }
 
 /** Get the input stream.
- * 
+ *
  */
-FILE *yyget_in  (void)
+FILE *
+yyget_in(void)
 {
-        return yyin;
+    return yyin;
 }
 
 /** Get the output stream.
- * 
+ *
  */
-FILE *yyget_out  (void)
+FILE *
+yyget_out(void)
 {
-        return yyout;
+    return yyout;
 }
 
 /** Get the length of the current token.
- * 
+ *
  */
-int yyget_leng  (void)
+int
+yyget_leng(void)
 {
-        return yyleng;
+    return yyleng;
 }
 
 /** Get the current token.
- * 
+ *
  */
 
-char *yyget_text  (void)
+char *
+yyget_text(void)
 {
-        return yytext;
+    return yytext;
 }
 
 /** Set the current line number.
  * @param _line_number line number
- * 
+ *
  */
-void yyset_lineno (int  _line_number )
+void
+yyset_lineno(int _line_number)
 {
-    
+
     yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param _in_str A readable stream.
- * 
+ *
  * @see yy_switch_to_buffer
  */
-void yyset_in (FILE *  _in_str )
+void
+yyset_in(FILE *_in_str)
 {
-        yyin = _in_str ;
+    yyin = _in_str;
 }
 
-void yyset_out (FILE *  _out_str )
+void
+yyset_out(FILE *_out_str)
 {
-        yyout = _out_str ;
+    yyout = _out_str;
 }
 
-int yyget_debug  (void)
+int
+yyget_debug(void)
 {
-        return yy_flex_debug;
+    return yy_flex_debug;
 }
 
-void yyset_debug (int  _bdebug )
+void
+yyset_debug(int _bdebug)
 {
-        yy_flex_debug = _bdebug ;
+    yy_flex_debug = _bdebug;
 }
 
-static int yy_init_globals (void)
+static int
+yy_init_globals(void)
 {
-        /* Initialization is the same as for the non-reentrant scanner.
+    /* Initialization is the same as for the non-reentrant scanner.
      * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = NULL;
+    (yy_buffer_stack)     = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = NULL;
-    (yy_init) = 0;
-    (yy_start) = 0;
+    (yy_c_buf_p)          = NULL;
+    (yy_init)             = 0;
+    (yy_start)            = 0;
 
-    (yy_state_buf) = 0;
-    (yy_state_ptr) = 0;
+    (yy_state_buf)  = 0;
+    (yy_state_ptr)  = 0;
     (yy_full_match) = 0;
-    (yy_lp) = 0;
+    (yy_lp)         = 0;
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-    yyin = stdin;
+    yyin  = stdin;
     yyout = stdout;
 #else
     yyin = NULL;
@@ -2726,26 +2608,27 @@ static int yy_init_globals (void)
 }
 
 /* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
+int
+yylex_destroy(void)
 {
-    
+
     /* Pop the buffer stack, destroying each element. */
-	while(YY_CURRENT_BUFFER){
-		yy_delete_buffer( YY_CURRENT_BUFFER  );
-		YY_CURRENT_BUFFER_LVALUE = NULL;
-		yypop_buffer_state();
-	}
+    while (YY_CURRENT_BUFFER) {
+        yy_delete_buffer(YY_CURRENT_BUFFER);
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+        yypop_buffer_state();
+    }
 
-	/* Destroy the stack itself. */
-	yyfree((yy_buffer_stack) );
-	(yy_buffer_stack) = NULL;
+    /* Destroy the stack itself. */
+    yyfree((yy_buffer_stack));
+    (yy_buffer_stack) = NULL;
 
-    yyfree ( (yy_state_buf) );
-    (yy_state_buf)  = NULL;
+    yyfree((yy_state_buf));
+    (yy_state_buf) = NULL;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
      * yylex() is called, initialization will occur. */
-    yy_init_globals( );
+    yy_init_globals();
 
     return 0;
 }
@@ -2755,70 +2638,77 @@ int yylex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, const char * s2, int n )
+static void
+yy_flex_strncpy(char *s1, const char *s2, int n)
 {
-		
-	int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
+
+    int i;
+    for (i = 0; i < n; ++i)
+        s1[i] = s2[i];
 }
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (const char * s )
+static int
+yy_flex_strlen(const char *s)
 {
-	int n;
-	for ( n = 0; s[n]; ++n )
-		;
+    int n;
+    for (n = 0; s[n]; ++n)
+        ;
 
-	return n;
+    return n;
 }
 #endif
 
-void *yyalloc (yy_size_t  size )
+void *
+yyalloc(yy_size_t size)
 {
-			return malloc(size);
+    return malloc(size);
 }
 
-void *yyrealloc  (void * ptr, yy_size_t  size )
+void *
+yyrealloc(void *ptr, yy_size_t size)
 {
-		
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return realloc(ptr, size);
+
+    /* The cast to (char *) in the following accommodates both
+     * implementations that use char* generic pointers, and those
+     * that use void* generic pointers.  It works with the latter
+     * because both ANSI C and C++ allow castless assignment from
+     * any pointer type to void*, and deal with argument conversions
+     * as though doing an assignment.
+     */
+    return realloc(ptr, size);
 }
 
-void yyfree (void * ptr )
+void
+yyfree(void *ptr)
 {
-			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+    free((char *)ptr); /* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
 
 #line 191 "hl/src/H5LTanalyze.l"
 
-int my_yyinput(char *buf, int max_size)
+int
+my_yyinput(char *buf, int max_size)
 {
-   int ret;
-    
-   memcpy(buf, myinput, input_len); 
-   ret = (int)input_len;
-   return ret;
+    int ret;
+
+    memcpy(buf, myinput, input_len);
+    ret = (int)input_len;
+    return ret;
 }
 
-int H5LTyyerror(const char *msg)
+int
+H5LTyyerror(const char *msg)
 {
-   printf("ERROR: %s before \"%s\".\n", msg, yytext);
-   return 0;
+    printf("ERROR: %s before \"%s\".\n", msg, yytext);
+    return 0;
 }
 
-int yywrap()
+int
+yywrap()
 {
-    return(1);
+    return (1);
 }
-
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index a9b3dc3..291c89d 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -1,25 +1,25 @@
-#if defined __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__    
-#pragma GCC diagnostic ignored "-Wconversion"                     
-#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"  
-#pragma GCC diagnostic ignored "-Wlarger-than="                   
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"             
-#pragma GCC diagnostic ignored "-Wnested-externs"                 
-#pragma GCC diagnostic ignored "-Wold-style-definition"           
-#pragma GCC diagnostic ignored "-Wredundant-decls"                
-#pragma GCC diagnostic ignored "-Wsign-compare"                   
-#pragma GCC diagnostic ignored "-Wsign-conversion"                
-#pragma GCC diagnostic ignored "-Wstrict-overflow"                
-#pragma GCC diagnostic ignored "-Wstrict-prototypes"              
-#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"         
-#pragma GCC diagnostic ignored "-Wswitch-default"                 
-#pragma GCC diagnostic ignored "-Wunused-function"                
-#pragma GCC diagnostic ignored "-Wunused-macros"                  
-#pragma GCC diagnostic ignored "-Wunused-parameter"               
-#elif defined __SUNPRO_CC                                         
-#pragma disable_warn                                              
-#elif defined _MSC_VER                                            
-#pragma warning(push, 1)                                          
-#endif                                                            
+#if defined            __GNUC__ && 402 <= __GNUC__ * 100 + __GNUC_MINOR__
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
+#pragma GCC diagnostic ignored "-Wlarger-than="
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wnested-externs"
+#pragma GCC diagnostic ignored "-Wold-style-definition"
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wstrict-overflow"
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+#pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#pragma GCC diagnostic ignored "-Wunused-function"
+#pragma GCC diagnostic ignored "-Wunused-macros"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#elif defined          __SUNPRO_CC
+#pragma disable_warn
+#elif defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 /* A Bison parser, made by GNU Bison 3.0.4.  */
 
 /* Bison implementation for Yacc-like parsers in C
@@ -80,16 +80,15 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
-
 /* Substitute the variable and function names.  */
-#define yyparse         H5LTyyparse
-#define yylex           H5LTyylex
-#define yyerror         H5LTyyerror
-#define yydebug         H5LTyydebug
-#define yynerrs         H5LTyynerrs
+#define yyparse H5LTyyparse
+#define yylex   H5LTyylex
+#define yyerror H5LTyyerror
+#define yydebug H5LTyydebug
+#define yynerrs H5LTyynerrs
 
-#define yylval          H5LTyylval
-#define yychar          H5LTyychar
+#define yylval H5LTyylval
+#define yychar H5LTyychar
 
 /* Copy the first part of user declarations.  */
 #line 20 "hl/src/H5LTparse.y" /* yacc.c:339  */
@@ -101,75 +100,72 @@
 extern int yylex();
 extern int yyerror(const char *);
 
-#define STACK_SIZE      16
+#define STACK_SIZE 16
 
 /*structure for compound type information*/
 struct cmpd_info {
-    hid_t       id;             /*type ID*/
-    hbool_t     is_field;       /*flag to lexer for compound member*/
-    hbool_t     first_memb;     /*flag for first compound member*/
+    hid_t   id;         /*type ID*/
+    hbool_t is_field;   /*flag to lexer for compound member*/
+    hbool_t first_memb; /*flag for first compound member*/
 };
 
 /*stack for nested compound type*/
-struct cmpd_info cmpd_stack[STACK_SIZE] = {
-    {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1},
-    {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1},
-    {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1},
-    {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1} };
+struct cmpd_info cmpd_stack[STACK_SIZE] = {{0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1},
+                                           {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1},
+                                           {0, 0, 1}, {0, 0, 1}, {0, 0, 1}, {0, 0, 1}};
 
-int csindex = -1;                /*pointer to the top of compound stack*/
+int csindex = -1; /*pointer to the top of compound stack*/
 
 /*structure for array type information*/
 struct arr_info {
-    hsize_t             dims[H5S_MAX_RANK];     /*size of each dimension, limited to 32 dimensions*/
-    unsigned            ndims;                  /*number of dimensions*/
-    hbool_t             is_dim;                 /*flag to lexer for dimension*/
+    hsize_t  dims[H5S_MAX_RANK]; /*size of each dimension, limited to 32 dimensions*/
+    unsigned ndims;              /*number of dimensions*/
+    hbool_t  is_dim;             /*flag to lexer for dimension*/
 };
 /*stack for nested array type*/
 struct arr_info arr_stack[STACK_SIZE];
-int asindex = -1;               /*pointer to the top of array stack*/ 
+int             asindex = -1; /*pointer to the top of array stack*/
 
-hbool_t     is_str_size = 0;        /*flag to lexer for string size*/
-hbool_t     is_str_pad = 0;         /*flag to lexer for string padding*/
-H5T_str_t   str_pad;                /*variable for string padding*/
-H5T_cset_t  str_cset;               /*variable for string character set*/
-hbool_t     is_variable = 0;        /*variable for variable-length string*/
-size_t      str_size;               /*variable for string size*/
-   
-hid_t       enum_id;                /*type ID*/
-hbool_t     is_enum = 0;            /*flag to lexer for enum type*/
-hbool_t     is_enum_memb = 0;       /*flag to lexer for enum member*/
-char*       enum_memb_symbol;       /*enum member symbol string*/
+hbool_t    is_str_size = 0; /*flag to lexer for string size*/
+hbool_t    is_str_pad  = 0; /*flag to lexer for string padding*/
+H5T_str_t  str_pad;         /*variable for string padding*/
+H5T_cset_t str_cset;        /*variable for string character set*/
+hbool_t    is_variable = 0; /*variable for variable-length string*/
+size_t     str_size;        /*variable for string size*/
 
-hbool_t is_opq_size = 0;            /*flag to lexer for opaque type size*/
-hbool_t is_opq_tag = 0;             /*flag to lexer for opaque type tag*/
+hid_t   enum_id;          /*type ID*/
+hbool_t is_enum      = 0; /*flag to lexer for enum type*/
+hbool_t is_enum_memb = 0; /*flag to lexer for enum member*/
+char *  enum_memb_symbol; /*enum member symbol string*/
 
+hbool_t is_opq_size = 0; /*flag to lexer for opaque type size*/
+hbool_t is_opq_tag  = 0; /*flag to lexer for opaque type tag*/
 
 #line 127 "hl/src/H5LTparse.c" /* yacc.c:339  */
 
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
+#ifndef YY_NULLPTR
+#if defined __cplusplus && 201103L <= __cplusplus
+#define YY_NULLPTR nullptr
+#else
+#define YY_NULLPTR 0
+#endif
+#endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
+#undef YYERROR_VERBOSE
+#define YYERROR_VERBOSE 1
 #else
-# define YYERROR_VERBOSE 0
+#define YYERROR_VERBOSE 0
 #endif
 
 /* In a future release of Bison, this section will be replaced
    by #include "H5LTparse.h".  */
 #ifndef YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
-# define YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
+#define YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+#define YYDEBUG 0
 #endif
 #if YYDEBUG
 extern int H5LTyydebug;
@@ -177,91 +173,88 @@ extern int H5LTyydebug;
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    H5T_STD_I8BE_TOKEN = 258,
-    H5T_STD_I8LE_TOKEN = 259,
-    H5T_STD_I16BE_TOKEN = 260,
-    H5T_STD_I16LE_TOKEN = 261,
-    H5T_STD_I32BE_TOKEN = 262,
-    H5T_STD_I32LE_TOKEN = 263,
-    H5T_STD_I64BE_TOKEN = 264,
-    H5T_STD_I64LE_TOKEN = 265,
-    H5T_STD_U8BE_TOKEN = 266,
-    H5T_STD_U8LE_TOKEN = 267,
-    H5T_STD_U16BE_TOKEN = 268,
-    H5T_STD_U16LE_TOKEN = 269,
-    H5T_STD_U32BE_TOKEN = 270,
-    H5T_STD_U32LE_TOKEN = 271,
-    H5T_STD_U64BE_TOKEN = 272,
-    H5T_STD_U64LE_TOKEN = 273,
-    H5T_NATIVE_CHAR_TOKEN = 274,
-    H5T_NATIVE_SCHAR_TOKEN = 275,
-    H5T_NATIVE_UCHAR_TOKEN = 276,
-    H5T_NATIVE_SHORT_TOKEN = 277,
-    H5T_NATIVE_USHORT_TOKEN = 278,
-    H5T_NATIVE_INT_TOKEN = 279,
-    H5T_NATIVE_UINT_TOKEN = 280,
-    H5T_NATIVE_LONG_TOKEN = 281,
-    H5T_NATIVE_ULONG_TOKEN = 282,
-    H5T_NATIVE_LLONG_TOKEN = 283,
-    H5T_NATIVE_ULLONG_TOKEN = 284,
-    H5T_IEEE_F32BE_TOKEN = 285,
-    H5T_IEEE_F32LE_TOKEN = 286,
-    H5T_IEEE_F64BE_TOKEN = 287,
-    H5T_IEEE_F64LE_TOKEN = 288,
-    H5T_NATIVE_FLOAT_TOKEN = 289,
-    H5T_NATIVE_DOUBLE_TOKEN = 290,
+#define YYTOKENTYPE
+enum yytokentype {
+    H5T_STD_I8BE_TOKEN       = 258,
+    H5T_STD_I8LE_TOKEN       = 259,
+    H5T_STD_I16BE_TOKEN      = 260,
+    H5T_STD_I16LE_TOKEN      = 261,
+    H5T_STD_I32BE_TOKEN      = 262,
+    H5T_STD_I32LE_TOKEN      = 263,
+    H5T_STD_I64BE_TOKEN      = 264,
+    H5T_STD_I64LE_TOKEN      = 265,
+    H5T_STD_U8BE_TOKEN       = 266,
+    H5T_STD_U8LE_TOKEN       = 267,
+    H5T_STD_U16BE_TOKEN      = 268,
+    H5T_STD_U16LE_TOKEN      = 269,
+    H5T_STD_U32BE_TOKEN      = 270,
+    H5T_STD_U32LE_TOKEN      = 271,
+    H5T_STD_U64BE_TOKEN      = 272,
+    H5T_STD_U64LE_TOKEN      = 273,
+    H5T_NATIVE_CHAR_TOKEN    = 274,
+    H5T_NATIVE_SCHAR_TOKEN   = 275,
+    H5T_NATIVE_UCHAR_TOKEN   = 276,
+    H5T_NATIVE_SHORT_TOKEN   = 277,
+    H5T_NATIVE_USHORT_TOKEN  = 278,
+    H5T_NATIVE_INT_TOKEN     = 279,
+    H5T_NATIVE_UINT_TOKEN    = 280,
+    H5T_NATIVE_LONG_TOKEN    = 281,
+    H5T_NATIVE_ULONG_TOKEN   = 282,
+    H5T_NATIVE_LLONG_TOKEN   = 283,
+    H5T_NATIVE_ULLONG_TOKEN  = 284,
+    H5T_IEEE_F32BE_TOKEN     = 285,
+    H5T_IEEE_F32LE_TOKEN     = 286,
+    H5T_IEEE_F64BE_TOKEN     = 287,
+    H5T_IEEE_F64LE_TOKEN     = 288,
+    H5T_NATIVE_FLOAT_TOKEN   = 289,
+    H5T_NATIVE_DOUBLE_TOKEN  = 290,
     H5T_NATIVE_LDOUBLE_TOKEN = 291,
-    H5T_STRING_TOKEN = 292,
-    STRSIZE_TOKEN = 293,
-    STRPAD_TOKEN = 294,
-    CSET_TOKEN = 295,
-    CTYPE_TOKEN = 296,
-    H5T_VARIABLE_TOKEN = 297,
-    H5T_STR_NULLTERM_TOKEN = 298,
-    H5T_STR_NULLPAD_TOKEN = 299,
-    H5T_STR_SPACEPAD_TOKEN = 300,
-    H5T_CSET_ASCII_TOKEN = 301,
-    H5T_CSET_UTF8_TOKEN = 302,
-    H5T_C_S1_TOKEN = 303,
-    H5T_FORTRAN_S1_TOKEN = 304,
-    H5T_OPAQUE_TOKEN = 305,
-    OPQ_SIZE_TOKEN = 306,
-    OPQ_TAG_TOKEN = 307,
-    H5T_COMPOUND_TOKEN = 308,
-    H5T_ENUM_TOKEN = 309,
-    H5T_ARRAY_TOKEN = 310,
-    H5T_VLEN_TOKEN = 311,
-    STRING = 312,
-    NUMBER = 313
-  };
+    H5T_STRING_TOKEN         = 292,
+    STRSIZE_TOKEN            = 293,
+    STRPAD_TOKEN             = 294,
+    CSET_TOKEN               = 295,
+    CTYPE_TOKEN              = 296,
+    H5T_VARIABLE_TOKEN       = 297,
+    H5T_STR_NULLTERM_TOKEN   = 298,
+    H5T_STR_NULLPAD_TOKEN    = 299,
+    H5T_STR_SPACEPAD_TOKEN   = 300,
+    H5T_CSET_ASCII_TOKEN     = 301,
+    H5T_CSET_UTF8_TOKEN      = 302,
+    H5T_C_S1_TOKEN           = 303,
+    H5T_FORTRAN_S1_TOKEN     = 304,
+    H5T_OPAQUE_TOKEN         = 305,
+    OPQ_SIZE_TOKEN           = 306,
+    OPQ_TAG_TOKEN            = 307,
+    H5T_COMPOUND_TOKEN       = 308,
+    H5T_ENUM_TOKEN           = 309,
+    H5T_ARRAY_TOKEN          = 310,
+    H5T_VLEN_TOKEN           = 311,
+    STRING                   = 312,
+    NUMBER                   = 313
+};
 #endif
 
 /* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
 
-union YYSTYPE
-{
+union YYSTYPE {
 #line 72 "hl/src/H5LTparse.y" /* yacc.c:355  */
 
-    int     ival;         /*for integer token*/
-    char    *sval;        /*for name string*/
-    hid_t   hid;          /*for hid_t token*/
+    int   ival; /*for integer token*/
+    char *sval; /*for name string*/
+    hid_t hid;  /*for hid_t token*/
 
 #line 232 "hl/src/H5LTparse.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
+#define YYSTYPE_IS_TRIVIAL  1
+#define YYSTYPE_IS_DECLARED 1
 #endif
 
-
 extern YYSTYPE H5LTyylval;
 
-hid_t H5LTyyparse (void);
+hid_t H5LTyyparse(void);
 
 #endif /* !YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED  */
 
@@ -270,19 +263,19 @@ hid_t H5LTyyparse (void);
 #line 249 "hl/src/H5LTparse.c" /* yacc.c:358  */
 
 #ifdef short
-# undef short
+#undef short
 #endif
 
 #ifdef YYTYPE_UINT8
 typedef YYTYPE_UINT8 yytype_uint8;
 #else
-typedef unsigned char yytype_uint8;
+typedef unsigned char      yytype_uint8;
 #endif
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
 #else
-typedef signed char yytype_int8;
+typedef signed char        yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -294,623 +287,558 @@ typedef unsigned short int yytype_uint16;
 #ifdef YYTYPE_INT16
 typedef YYTYPE_INT16 yytype_int16;
 #else
-typedef short int yytype_int16;
+typedef short int          yytype_int16;
 #endif
 
 #ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
+#ifdef __SIZE_TYPE__
+#define YYSIZE_T __SIZE_TYPE__
+#elif defined size_t
+#define YYSIZE_T size_t
+#elif !defined YYSIZE_T
+#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#define YYSIZE_T size_t
+#else
+#define YYSIZE_T unsigned int
+#endif
 #endif
 
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+#define YYSIZE_MAXIMUM ((YYSIZE_T)-1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
+#if defined YYENABLE_NLS && YYENABLE_NLS
+#if ENABLE_NLS
+#include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#define YY_(Msgid) dgettext("bison-runtime", Msgid)
+#endif
+#endif
+#ifndef YY_
+#define YY_(Msgid) Msgid
+#endif
 #endif
 
 #ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
+#if (defined __GNUC__ && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) ||                       \
+    defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+#else
+#define YY_ATTRIBUTE(Spec) /* empty */
+#endif
 #endif
 
 #ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#define YY_ATTRIBUTE_PURE YY_ATTRIBUTE((__pure__))
 #endif
 
 #ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE((__unused__))
 #endif
 
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
+#if !defined _Noreturn && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+#if defined _MSC_VER && 1200 <= _MSC_VER
+#define _Noreturn __declspec(noreturn)
+#else
+#define _Noreturn YY_ATTRIBUTE((__noreturn__))
+#endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
+#if !defined lint || defined __GNUC__
+#define YYUSE(E) ((void)(E))
 #else
-# define YYUSE(E) /* empty */
+#define YYUSE(E) /* empty */
 #endif
 
 #if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
+#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                                                                  \
+    _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wuninitialized\"")                     \
+        _Pragma("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+#define YY_IGNORE_MAYBE_UNINITIALIZED_END _Pragma("GCC diagnostic pop")
 #else
-# define YY_INITIAL_VALUE(Value) Value
+#define YY_INITIAL_VALUE(Value) Value
 #endif
 #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+#define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
 #ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+#ifdef YYSTACK_USE_ALLOCA
+#if YYSTACK_USE_ALLOCA
+#ifdef __GNUC__
+#define YYSTACK_ALLOC __builtin_alloca
+#elif defined __BUILTIN_VA_ARG_INCR
+#include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#elif defined _AIX
+#define YYSTACK_ALLOC __alloca
+#elif defined _MSC_VER
+#include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#define alloca _alloca
+#else
+#define YYSTACK_ALLOC alloca
+#if !defined _ALLOCA_H && !defined EXIT_SUCCESS
+#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+/* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#endif
+#endif
+#endif
+#endif
 
+#ifdef YYSTACK_ALLOC
+/* Pacify GCC's 'empty if-body' warning.  */
+#define YYSTACK_FREE(Ptr)                                                                                    \
+    do { /* empty */                                                                                         \
+        ;                                                                                                    \
+    } while (0)
+#ifndef YYSTACK_ALLOC_MAXIMUM
+/* The OS might guarantee only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+   to allow for a few compiler-allocated temporary stack slots.  */
+#define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#endif
+#else
+#define YYSTACK_ALLOC YYMALLOC
+#define YYSTACK_FREE  YYFREE
+#ifndef YYSTACK_ALLOC_MAXIMUM
+#define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#endif
+#if (defined __cplusplus && !defined EXIT_SUCCESS &&                                                         \
+     !((defined YYMALLOC || defined malloc) && (defined YYFREE || defined free)))
+#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#endif
+#ifndef YYMALLOC
+#define YYMALLOC malloc
+#if !defined malloc && !defined EXIT_SUCCESS
+void *malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#endif
+#endif
+#ifndef YYFREE
+#define YYFREE free
+#if !defined free && !defined EXIT_SUCCESS
+void  free(void *);     /* INFRINGES ON USER NAME SPACE */
+#endif
+#endif
+#endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+#if (!defined yyoverflow && (!defined __cplusplus || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
+union yyalloc {
+    yytype_int16 yyss_alloc;
+    YYSTYPE      yyvs_alloc;
 };
 
 /* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+#define YYSTACK_GAP_MAXIMUM (sizeof(union yyalloc) - 1)
 
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
+#define YYSTACK_BYTES(N) ((N) * (sizeof(yytype_int16) + sizeof(YYSTYPE)) + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+#define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (0)
+#define YYSTACK_RELOCATE(Stack_alloc, Stack)                                                                 \
+    do {                                                                                                     \
+        YYSIZE_T yynewbytes;                                                                                 \
+        YYCOPY(&yyptr->Stack_alloc, Stack, yysize);                                                          \
+        Stack      = &yyptr->Stack_alloc;                                                                    \
+        yynewbytes = yystacksize * sizeof(*Stack) + YYSTACK_GAP_MAXIMUM;                                     \
+        yyptr += yynewbytes / sizeof(*yyptr);                                                                \
+    } while (0)
 
 #endif
 
 #if defined YYCOPY_NEEDED && YYCOPY_NEEDED
 /* Copy COUNT objects from SRC to DST.  The source and destination do
    not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (0)
-#  endif
-# endif
+#ifndef YYCOPY
+#if defined __GNUC__ && 1 < __GNUC__
+#define YYCOPY(Dst, Src, Count) __builtin_memcpy(Dst, Src, (Count) * sizeof(*(Src)))
+#else
+#define YYCOPY(Dst, Src, Count)                                                                              \
+    do {                                                                                                     \
+        YYSIZE_T yyi;                                                                                        \
+        for (yyi = 0; yyi < (Count); yyi++)                                                                  \
+            (Dst)[yyi] = (Src)[yyi];                                                                         \
+    } while (0)
+#endif
+#endif
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  58
+#define YYFINAL 58
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   203
+#define YYLAST 203
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  66
+#define YYNTOKENS 66
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  46
+#define YYNNTS 46
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  95
+#define YYNRULES 95
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  143
+#define YYNSTATES 143
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   313
+#define YYUNDEFTOK 2
+#define YYMAXUTOK  313
 
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+#define YYTRANSLATE(YYX) ((unsigned int)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, without out-of-bounds checking.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,    63,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    64,    65,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    61,     2,    62,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    59,     2,    60,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58
-};
+static const yytype_uint8 yytranslate[] = {
+    0,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  63, 2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  64, 65, 2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  61, 2,  62, 2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  59, 2,
+    60, 2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+    2,  2,  2,  2,  2,  2,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+    45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58};
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,   105,   105,   106,   108,   109,   110,   111,   113,   114,
-     115,   116,   117,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     149,   150,   151,   152,   153,   154,   155,   159,   158,   167,
-     168,   170,   170,   207,   215,   216,   219,   221,   221,   230,
-     231,   233,   234,   233,   241,   244,   250,   251,   256,   257,
-     248,   265,   267,   271,   272,   280,   289,   296,   269,   320,
-     321,   323,   324,   325,   327,   328,   330,   331,   335,   334,
-     339,   340,   342,   342,   396,   398
-};
+/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] = {
+    0,   105, 105, 106, 108, 109, 110, 111, 113, 114, 115, 116, 117, 120, 121, 122, 123, 124, 125, 126,
+    127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+    149, 150, 151, 152, 153, 154, 155, 159, 158, 167, 168, 170, 170, 207, 215, 216, 219, 221, 221, 230,
+    231, 233, 234, 233, 241, 244, 250, 251, 256, 257, 248, 265, 267, 271, 272, 280, 289, 296, 269, 320,
+    321, 323, 324, 325, 327, 328, 330, 331, 335, 334, 339, 340, 342, 342, 396, 398};
 #endif
 
 #if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "H5T_STD_I8BE_TOKEN",
-  "H5T_STD_I8LE_TOKEN", "H5T_STD_I16BE_TOKEN", "H5T_STD_I16LE_TOKEN",
-  "H5T_STD_I32BE_TOKEN", "H5T_STD_I32LE_TOKEN", "H5T_STD_I64BE_TOKEN",
-  "H5T_STD_I64LE_TOKEN", "H5T_STD_U8BE_TOKEN", "H5T_STD_U8LE_TOKEN",
-  "H5T_STD_U16BE_TOKEN", "H5T_STD_U16LE_TOKEN", "H5T_STD_U32BE_TOKEN",
-  "H5T_STD_U32LE_TOKEN", "H5T_STD_U64BE_TOKEN", "H5T_STD_U64LE_TOKEN",
-  "H5T_NATIVE_CHAR_TOKEN", "H5T_NATIVE_SCHAR_TOKEN",
-  "H5T_NATIVE_UCHAR_TOKEN", "H5T_NATIVE_SHORT_TOKEN",
-  "H5T_NATIVE_USHORT_TOKEN", "H5T_NATIVE_INT_TOKEN",
-  "H5T_NATIVE_UINT_TOKEN", "H5T_NATIVE_LONG_TOKEN",
-  "H5T_NATIVE_ULONG_TOKEN", "H5T_NATIVE_LLONG_TOKEN",
-  "H5T_NATIVE_ULLONG_TOKEN", "H5T_IEEE_F32BE_TOKEN",
-  "H5T_IEEE_F32LE_TOKEN", "H5T_IEEE_F64BE_TOKEN", "H5T_IEEE_F64LE_TOKEN",
-  "H5T_NATIVE_FLOAT_TOKEN", "H5T_NATIVE_DOUBLE_TOKEN",
-  "H5T_NATIVE_LDOUBLE_TOKEN", "H5T_STRING_TOKEN", "STRSIZE_TOKEN",
-  "STRPAD_TOKEN", "CSET_TOKEN", "CTYPE_TOKEN", "H5T_VARIABLE_TOKEN",
-  "H5T_STR_NULLTERM_TOKEN", "H5T_STR_NULLPAD_TOKEN",
-  "H5T_STR_SPACEPAD_TOKEN", "H5T_CSET_ASCII_TOKEN", "H5T_CSET_UTF8_TOKEN",
-  "H5T_C_S1_TOKEN", "H5T_FORTRAN_S1_TOKEN", "H5T_OPAQUE_TOKEN",
-  "OPQ_SIZE_TOKEN", "OPQ_TAG_TOKEN", "H5T_COMPOUND_TOKEN",
-  "H5T_ENUM_TOKEN", "H5T_ARRAY_TOKEN", "H5T_VLEN_TOKEN", "STRING",
-  "NUMBER", "'{'", "'}'", "'['", "']'", "'\"'", "':'", "';'", "$accept",
-  "start", "ddl_type", "atomic_type", "integer_type", "fp_type",
-  "compound_type", "$@1", "memb_list", "memb_def", "$@2", "field_name",
-  "field_offset", "offset", "array_type", "$@3", "dim_list", "dim", "$@4",
-  "$@5", "dimsize", "vlen_type", "opaque_type", "$@6", "@7", "$@8", "$@9",
-  "opaque_size", "opaque_tag", "string_type", "$@10", "$@11", "$@12",
-  "$@13", "@14", "strsize", "strpad", "cset", "ctype", "enum_type", "$@15",
-  "enum_list", "enum_def", "$@16", "enum_symbol", "enum_val", YY_NULLPTR
-};
+static const char *const yytname[] = {"$end",
+                                      "error",
+                                      "$undefined",
+                                      "H5T_STD_I8BE_TOKEN",
+                                      "H5T_STD_I8LE_TOKEN",
+                                      "H5T_STD_I16BE_TOKEN",
+                                      "H5T_STD_I16LE_TOKEN",
+                                      "H5T_STD_I32BE_TOKEN",
+                                      "H5T_STD_I32LE_TOKEN",
+                                      "H5T_STD_I64BE_TOKEN",
+                                      "H5T_STD_I64LE_TOKEN",
+                                      "H5T_STD_U8BE_TOKEN",
+                                      "H5T_STD_U8LE_TOKEN",
+                                      "H5T_STD_U16BE_TOKEN",
+                                      "H5T_STD_U16LE_TOKEN",
+                                      "H5T_STD_U32BE_TOKEN",
+                                      "H5T_STD_U32LE_TOKEN",
+                                      "H5T_STD_U64BE_TOKEN",
+                                      "H5T_STD_U64LE_TOKEN",
+                                      "H5T_NATIVE_CHAR_TOKEN",
+                                      "H5T_NATIVE_SCHAR_TOKEN",
+                                      "H5T_NATIVE_UCHAR_TOKEN",
+                                      "H5T_NATIVE_SHORT_TOKEN",
+                                      "H5T_NATIVE_USHORT_TOKEN",
+                                      "H5T_NATIVE_INT_TOKEN",
+                                      "H5T_NATIVE_UINT_TOKEN",
+                                      "H5T_NATIVE_LONG_TOKEN",
+                                      "H5T_NATIVE_ULONG_TOKEN",
+                                      "H5T_NATIVE_LLONG_TOKEN",
+                                      "H5T_NATIVE_ULLONG_TOKEN",
+                                      "H5T_IEEE_F32BE_TOKEN",
+                                      "H5T_IEEE_F32LE_TOKEN",
+                                      "H5T_IEEE_F64BE_TOKEN",
+                                      "H5T_IEEE_F64LE_TOKEN",
+                                      "H5T_NATIVE_FLOAT_TOKEN",
+                                      "H5T_NATIVE_DOUBLE_TOKEN",
+                                      "H5T_NATIVE_LDOUBLE_TOKEN",
+                                      "H5T_STRING_TOKEN",
+                                      "STRSIZE_TOKEN",
+                                      "STRPAD_TOKEN",
+                                      "CSET_TOKEN",
+                                      "CTYPE_TOKEN",
+                                      "H5T_VARIABLE_TOKEN",
+                                      "H5T_STR_NULLTERM_TOKEN",
+                                      "H5T_STR_NULLPAD_TOKEN",
+                                      "H5T_STR_SPACEPAD_TOKEN",
+                                      "H5T_CSET_ASCII_TOKEN",
+                                      "H5T_CSET_UTF8_TOKEN",
+                                      "H5T_C_S1_TOKEN",
+                                      "H5T_FORTRAN_S1_TOKEN",
+                                      "H5T_OPAQUE_TOKEN",
+                                      "OPQ_SIZE_TOKEN",
+                                      "OPQ_TAG_TOKEN",
+                                      "H5T_COMPOUND_TOKEN",
+                                      "H5T_ENUM_TOKEN",
+                                      "H5T_ARRAY_TOKEN",
+                                      "H5T_VLEN_TOKEN",
+                                      "STRING",
+                                      "NUMBER",
+                                      "'{'",
+                                      "'}'",
+                                      "'['",
+                                      "']'",
+                                      "'\"'",
+                                      "':'",
+                                      "';'",
+                                      "$accept",
+                                      "start",
+                                      "ddl_type",
+                                      "atomic_type",
+                                      "integer_type",
+                                      "fp_type",
+                                      "compound_type",
+                                      "$@1",
+                                      "memb_list",
+                                      "memb_def",
+                                      "$@2",
+                                      "field_name",
+                                      "field_offset",
+                                      "offset",
+                                      "array_type",
+                                      "$@3",
+                                      "dim_list",
+                                      "dim",
+                                      "$@4",
+                                      "$@5",
+                                      "dimsize",
+                                      "vlen_type",
+                                      "opaque_type",
+                                      "$@6",
+                                      "@7",
+                                      "$@8",
+                                      "$@9",
+                                      "opaque_size",
+                                      "opaque_tag",
+                                      "string_type",
+                                      "$@10",
+                                      "$@11",
+                                      "$@12",
+                                      "$@13",
+                                      "@14",
+                                      "strsize",
+                                      "strpad",
+                                      "cset",
+                                      "ctype",
+                                      "enum_type",
+                                      "$@15",
+                                      "enum_list",
+                                      "enum_def",
+                                      "$@16",
+                                      "enum_symbol",
+                                      "enum_val",
+                                      YY_NULLPTR};
 #endif
 
-# ifdef YYPRINT
+#ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
-     305,   306,   307,   308,   309,   310,   311,   312,   313,   123,
-     125,    91,    93,    34,    58,    59
-};
-# endif
+static const yytype_uint16 yytoknum[] = {0,   256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268,
+                                         269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282,
+                                         283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+                                         297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
+                                         311, 312, 313, 123, 125, 91,  93,  34,  58,  59};
+#endif
 
 #define YYPACT_NINF -25
 
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-25)))
+#define yypact_value_is_default(Yystate) (!!((Yystate) == (-25)))
 
 #define YYTABLE_NINF -1
 
-#define yytable_value_is_error(Yytable_value) \
-  0
-
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
-{
-     114,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -24,   -20,   -25,   -15,   -25,
-     -14,    49,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,    19,    45,    38,   168,    39,   114,   -25,   -25,
-     -25,   -25,    34,   -25,    40,    -4,    43,    56,   -25,    -3,
-     -25,   -25,   -25,    37,   -25,    42,   -25,   -25,   -25,   -25,
-     -25,    44,   -25,   -25,   -25,    50,   -23,    47,   -25,    64,
-      62,    51,   -25,    58,   -25,   -25,   -25,    -2,   -25,   -25,
-      89,   -25,    90,    92,   -25,   -25,   -25,    91,    94,    95,
-     -25,   -25,   -25,    98,   100,    96,   102,   122,   -25,   103,
-     -25,   -25,   -25,   -25,   133,     9,   134,   -25,   -25,   -25,
-     135,   -25,   -25,   105,   160,   -25,    46,   -25,   -25,   137,
-     -25,   143,   -25
-};
-
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       2,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,     0,     0,    47,     0,    57,
-       0,     0,     3,     4,     8,     9,     5,     6,     7,    12,
-      10,    11,     0,     0,     0,     0,     0,     0,     1,    73,
-      66,    49,     0,    59,     0,     0,     0,     0,    88,     0,
-      65,    79,    80,     0,    71,     0,    48,    51,    50,    90,
-      61,     0,    60,    74,    67,     0,     0,     0,    58,     0,
-       0,     0,    89,     0,    91,    64,    62,     0,    68,    53,
-       0,    94,     0,     0,    81,    82,    83,     0,     0,    54,
-      92,    63,    75,     0,     0,     0,     0,     0,    72,     0,
-      56,    55,    52,    95,     0,     0,     0,    93,    84,    85,
-       0,    69,    76,     0,     0,    70,     0,    86,    87,     0,
-      77,     0,    78
-};
-
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
-{
-     -25,   -25,   -21,   -25,   108,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,   -25,
-     -25,   -25,   -25,   -25,   -25,   -25
-};
-
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,    41,    42,    43,    44,    45,    46,    54,    67,    78,
-      85,   100,   115,   121,    47,    56,    69,    82,    87,   103,
-      96,    48,    49,    66,    90,   108,   133,    75,   119,    50,
-      65,    89,   117,   134,   141,    73,   107,   130,   139,    51,
-      79,    86,    94,   116,   102,   124
-};
-
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_uint8 yytable[] =
-{
-       1,     2,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    32,    33,    34,    35,    52,    64,    92,    71,    53,
-      93,   104,   105,   106,    55,    57,    77,    36,    81,    58,
-      37,    38,    39,    40,    72,   128,   129,    59,    80,     1,
-       2,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,   137,   138,    60,    61,    63,    68,
-      70,    74,    83,    97,    88,    95,    36,    84,    99,    37,
-      38,    39,    40,    91,    98,   101,    76,     1,     2,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,   109,   110,   111,   118,   112,   113,   120,   114,
-     123,   122,   125,    62,    36,   135,   126,    37,    38,    39,
-      40,     1,     2,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,   127,   131,
-     132,   136,   140,   142
-};
-
-static const yytype_uint8 yycheck[] =
-{
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,    37,    59,    57,    60,    42,    59,
-      63,    43,    44,    45,    59,    59,    67,    50,    69,     0,
-      53,    54,    55,    56,    58,    46,    47,    38,    61,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    48,    49,    51,    59,    59,    65,
-      60,    58,    65,    39,    60,    58,    50,    65,    57,    53,
-      54,    55,    56,    63,    52,    57,    60,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    63,    63,    62,    57,    65,    63,    58,    64,
-      58,    65,    40,    55,    50,    60,    63,    53,    54,    55,
-      56,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    65,    65,
-      65,    41,    65,    60
-};
-
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
-{
-       0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    50,    53,    54,    55,
-      56,    67,    68,    69,    70,    71,    72,    80,    87,    88,
-      95,   105,    59,    59,    73,    59,    81,    59,     0,    38,
-      51,    59,    70,    59,    68,    96,    89,    74,    65,    82,
-      60,    42,    58,   101,    58,    93,    60,    68,    75,   106,
-      61,    68,    83,    65,    65,    76,   107,    84,    60,    97,
-      90,    63,    60,    63,   108,    58,    86,    39,    52,    57,
-      77,    57,   110,    85,    43,    44,    45,   102,    91,    63,
-      63,    62,    65,    63,    64,    78,   109,    98,    57,    94,
-      58,    79,    65,    58,   111,    40,    63,    65,    46,    47,
-     103,    65,    65,    92,    99,    60,    41,    48,    49,   104,
-      65,   100,    60
-};
-
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    66,    67,    67,    68,    68,    68,    68,    69,    69,
-      69,    69,    69,    70,    70,    70,    70,    70,    70,    70,
-      70,    70,    70,    70,    70,    70,    70,    70,    70,    70,
-      70,    70,    70,    70,    70,    70,    70,    70,    70,    70,
-      71,    71,    71,    71,    71,    71,    71,    73,    72,    74,
-      74,    76,    75,    77,    78,    78,    79,    81,    80,    82,
-      82,    84,    85,    83,    86,    87,    89,    90,    91,    92,
-      88,    93,    94,    96,    97,    98,    99,   100,    95,   101,
-     101,   102,   102,   102,   103,   103,   104,   104,   106,   105,
-     107,   107,   109,   108,   110,   111
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     5,     0,
-       2,     0,     7,     1,     0,     2,     1,     0,     6,     0,
-       2,     0,     0,     5,     1,     4,     0,     0,     0,     0,
-      15,     1,     1,     0,     0,     0,     0,     0,    20,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     0,     7,
-       0,     2,     0,     6,     1,     1
-};
-
-
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
+#define yytable_value_is_error(Yytable_value) 0
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+static const yytype_int16 yypact[] = {
+    114, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25,
+    -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -24, -20, -25, -15, -25, -14, 49,
+    -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, 19,  45,  38,  168, 39,  114, -25, -25, -25, -25, 34,
+    -25, 40,  -4,  43,  56,  -25, -3,  -25, -25, -25, 37,  -25, 42,  -25, -25, -25, -25, -25, 44,  -25, -25,
+    -25, 50,  -23, 47,  -25, 64,  62,  51,  -25, 58,  -25, -25, -25, -2,  -25, -25, 89,  -25, 90,  92,  -25,
+    -25, -25, 91,  94,  95,  -25, -25, -25, 98,  100, 96,  102, 122, -25, 103, -25, -25, -25, -25, 133, 9,
+    134, -25, -25, -25, 135, -25, -25, 105, 160, -25, 46,  -25, -25, 137, -25, 143, -25};
+
+/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+   Performed when YYTABLE does not specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] = {
+    2,  13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+    36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 0,  0,  47, 0,  57, 0,  0,  3,  4,  8,  9,  5,  6,
+    7,  12, 10, 11, 0,  0,  0,  0,  0,  0,  1,  73, 66, 49, 0,  59, 0,  0,  0,  0,  88, 0,  65, 79,
+    80, 0,  71, 0,  48, 51, 50, 90, 61, 0,  60, 74, 67, 0,  0,  0,  58, 0,  0,  0,  89, 0,  91, 64,
+    62, 0,  68, 53, 0,  94, 0,  0,  81, 82, 83, 0,  0,  54, 92, 63, 75, 0,  0,  0,  0,  0,  72, 0,
+    56, 55, 52, 95, 0,  0,  0,  93, 84, 85, 0,  69, 76, 0,  0,  70, 0,  86, 87, 0,  77, 0,  78};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] = {-25, -25, -21, -25, 108, -25, -25, -25, -25, -25, -25, -25,
+                                      -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25,
+                                      -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25, -25,
+                                      -25, -25, -25, -25, -25, -25, -25, -25, -25, -25};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] = {
+    -1, 41, 42,  43,  44, 45,  46, 54, 67, 78,  85,  100, 115, 121, 47,  56,  69, 82, 87, 103, 96,  48,  49,
+    66, 90, 108, 133, 75, 119, 50, 65, 89, 117, 134, 141, 73,  107, 130, 139, 51, 79, 86, 94,  116, 102, 124};
+
+/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule whose
+   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+static const yytype_uint8 yytable[] = {
+    1,   2,   3,  4,  5,  6,   7,   8,   9,   10,  11,  12,  13,  14,  15,  16,  17, 18, 19,  20,  21,
+    22,  23,  24, 25, 26, 27,  28,  29,  30,  31,  32,  33,  34,  35,  52,  64,  92, 71, 53,  93,  104,
+    105, 106, 55, 57, 77, 36,  81,  58,  37,  38,  39,  40,  72,  128, 129, 59,  80, 1,  2,   3,   4,
+    5,   6,   7,  8,  9,  10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  20,  21, 22, 23,  24,  25,
+    26,  27,  28, 29, 30, 31,  32,  33,  34,  35,  137, 138, 60,  61,  63,  68,  70, 74, 83,  97,  88,
+    95,  36,  84, 99, 37, 38,  39,  40,  91,  98,  101, 76,  1,   2,   3,   4,   5,  6,  7,   8,   9,
+    10,  11,  12, 13, 14, 15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26, 27, 28,  29,  30,
+    31,  32,  33, 34, 35, 109, 110, 111, 118, 112, 113, 120, 114, 123, 122, 125, 62, 36, 135, 126, 37,
+    38,  39,  40, 1,  2,  3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14, 15, 16,  17,  18,
+    19,  20,  21, 22, 23, 24,  25,  26,  27,  127, 131, 132, 136, 140, 142};
+
+static const yytype_uint8 yycheck[] = {
+    3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+    29, 30, 31, 32, 33, 34, 35, 36, 37, 59, 57, 60, 42, 59, 63, 43, 44, 45, 59, 59, 67, 50, 69, 0,  53, 54,
+    55, 56, 58, 46, 47, 38, 61, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+    22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 48, 49, 51, 59, 59, 65, 60, 58, 65, 39,
+    60, 58, 50, 65, 57, 53, 54, 55, 56, 63, 52, 57, 60, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 63, 63, 62, 57,
+    65, 63, 58, 64, 58, 65, 40, 55, 50, 60, 63, 53, 54, 55, 56, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13,
+    14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 65, 65, 65, 41, 65, 60};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] = {
+    0,  3,  4,   5,  6,   7,  8,  9,  10, 11,  12,  13,  14, 15,  16, 17,  18,  19, 20,  21,  22,
+    23, 24, 25,  26, 27,  28, 29, 30, 31, 32,  33,  34,  35, 36,  37, 50,  53,  54, 55,  56,  67,
+    68, 69, 70,  71, 72,  80, 87, 88, 95, 105, 59,  59,  73, 59,  81, 59,  0,   38, 51,  59,  70,
+    59, 68, 96,  89, 74,  65, 82, 60, 42, 58,  101, 58,  93, 60,  68, 75,  106, 61, 68,  83,  65,
+    65, 76, 107, 84, 60,  97, 90, 63, 60, 63,  108, 58,  86, 39,  52, 57,  77,  57, 110, 85,  43,
+    44, 45, 102, 91, 63,  63, 62, 65, 63, 64,  78,  109, 98, 57,  94, 58,  79,  65, 58,  111, 40,
+    63, 65, 46,  47, 103, 65, 65, 92, 99, 60,  41,  48,  49, 104, 65, 100, 60};
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] = {
+    0,   66,  67,  67,  68,  68,  68,  68,  69,  69,  69,  69,  69,  70,  70,  70, 70, 70,  70, 70,
+    70,  70,  70,  70,  70,  70,  70,  70,  70,  70,  70,  70,  70,  70,  70,  70, 70, 70,  70, 70,
+    71,  71,  71,  71,  71,  71,  71,  73,  72,  74,  74,  76,  75,  77,  78,  78, 79, 81,  80, 82,
+    82,  84,  85,  83,  86,  87,  89,  90,  91,  92,  88,  93,  94,  96,  97,  98, 99, 100, 95, 101,
+    101, 102, 102, 102, 103, 103, 104, 104, 106, 105, 107, 107, 109, 108, 110, 111};
+
+/* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] = {0, 2, 0, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  1,
+                                    1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  0,
+                                    5, 0, 2, 0, 7, 1, 0,  2, 1, 0, 6, 0, 2, 0, 0, 5, 1, 4, 0, 0, 0, 0, 15, 1,
+                                    1, 0, 0, 0, 0, 0, 20, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 7, 0, 2, 0, 6, 1,  1};
+
+#define yyerrok   (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY   (-2)
+#define YYEOF     0
+
+#define YYACCEPT goto yyacceptlab
+#define YYABORT  goto yyabortlab
+#define YYERROR  goto yyerrorlab
+
+#define YYRECOVERING() (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                                                               \
+    do                                                                                                       \
+        if (yychar == YYEMPTY) {                                                                             \
+            yychar = (Token);                                                                                \
+            yylval = (Value);                                                                                \
+            YYPOPSTACK(yylen);                                                                               \
+            yystate = *yyssp;                                                                                \
+            goto yybackup;                                                                                   \
+        }                                                                                                    \
+        else {                                                                                               \
+            yyerror(YY_("syntax error: cannot back up"));                                                    \
+            YYERROR;                                                                                         \
+        }                                                                                                    \
+    while (0)
 
 /* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
+#define YYTERROR  1
+#define YYERRCODE 256
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
+#ifndef YYFPRINTF
+#include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#define YYFPRINTF fprintf
+#endif
 
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (0)
+#define YYDPRINTF(Args)                                                                                      \
+    do {                                                                                                     \
+        if (yydebug)                                                                                         \
+            YYFPRINTF Args;                                                                                  \
+    } while (0)
 
 /* This macro is provided for backward compatibility. */
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#define YY_LOCATION_PRINT(File, Loc) ((void)0)
 #endif
 
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (0)
-
+#define YY_SYMBOL_PRINT(Title, Type, Value, Location)                                                        \
+    do {                                                                                                     \
+        if (yydebug) {                                                                                       \
+            YYFPRINTF(stderr, "%s ", Title);                                                                 \
+            yy_symbol_print(stderr, Type, Value);                                                            \
+            YYFPRINTF(stderr, "\n");                                                                         \
+        }                                                                                                    \
+    } while (0)
 
 /*----------------------------------------.
 | Print this symbol's value on YYOUTPUT.  |
 `----------------------------------------*/
 
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print(FILE *yyoutput, int yytype, YYSTYPE const *const yyvaluep)
 {
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  YYUSE (yytype);
+    FILE *yyo = yyoutput;
+    YYUSE(yyo);
+    if (!yyvaluep)
+        return;
+#ifdef YYPRINT
+    if (yytype < YYNTOKENS)
+        YYPRINT(yyoutput, yytoknum[yytype], *yyvaluep);
+#endif
+    YYUSE(yytype);
 }
 
-
 /*--------------------------------.
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print(FILE *yyoutput, int yytype, YYSTYPE const *const yyvaluep)
 {
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
+    YYFPRINTF(yyoutput, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
+    yy_symbol_value_print(yyoutput, yytype, yyvaluep);
+    YYFPRINTF(yyoutput, ")");
 }
 
 /*------------------------------------------------------------------.
@@ -919,68 +847,60 @@ yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
 `------------------------------------------------------------------*/
 
 static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
+yy_stack_print(yytype_int16 *yybottom, yytype_int16 *yytop)
 {
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
+    YYFPRINTF(stderr, "Stack now");
+    for (; yybottom <= yytop; yybottom++) {
+        int yybot = *yybottom;
+        YYFPRINTF(stderr, " %d", yybot);
     }
-  YYFPRINTF (stderr, "\n");
+    YYFPRINTF(stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
-
+#define YY_STACK_PRINT(Bottom, Top)                                                                          \
+    do {                                                                                                     \
+        if (yydebug)                                                                                         \
+            yy_stack_print((Bottom), (Top));                                                                 \
+    } while (0)
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
 static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print(yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
-  unsigned long int yylno = yyrline[yyrule];
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
-      YYFPRINTF (stderr, "\n");
+    unsigned long int yylno  = yyrline[yyrule];
+    int               yynrhs = yyr2[yyrule];
+    int               yyi;
+    YYFPRINTF(stderr, "Reducing stack by rule %d (line %lu):\n", yyrule - 1, yylno);
+    /* The symbols being reduced.  */
+    for (yyi = 0; yyi < yynrhs; yyi++) {
+        YYFPRINTF(stderr, "   $%d = ", yyi + 1);
+        yy_symbol_print(stderr, yystos[yyssp[yyi + 1 - yynrhs]], &(yyvsp[(yyi + 1) - (yynrhs)]));
+        YYFPRINTF(stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
+#define YY_REDUCE_PRINT(Rule)                                                                                \
+    do {                                                                                                     \
+        if (yydebug)                                                                                         \
+            yy_reduce_print(yyssp, yyvsp, Rule);                                                             \
+    } while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
 int yydebug;
 #else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
+#define YYDPRINTF(Args)
+#define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+#define YY_STACK_PRINT(Bottom, Top)
+#define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
 
-
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #ifndef YYINITDEPTH
-# define YYINITDEPTH 200
+#define YYINITDEPTH 200
 #endif
 
 /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
@@ -991,49 +911,48 @@ int yydebug;
    evaluated with infinite-precision integer arithmetic.  */
 
 #ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
+#define YYMAXDEPTH 10000
 #endif
 
-
 #if YYERROR_VERBOSE
 
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
+#ifndef yystrlen
+#if defined __GLIBC__ && defined _STRING_H
+#define yystrlen strlen
+#else
 /* Return the length of YYSTR.  */
 static YYSIZE_T
-yystrlen (const char *yystr)
+yystrlen(const char *yystr)
 {
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
+    YYSIZE_T yylen;
+    for (yylen = 0; yystr[yylen]; yylen++)
+        continue;
+    return yylen;
 }
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
+#ifndef yystpcpy
+#if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#define yystpcpy stpcpy
+#else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
 static char *
-yystpcpy (char *yydest, const char *yysrc)
+yystpcpy(char *yydest, const char *yysrc)
 {
-  char *yyd = yydest;
-  const char *yys = yysrc;
+    char *      yyd = yydest;
+    const char *yys = yysrc;
 
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
+    while ((*yyd++ = *yys++) != '\0')
+        continue;
 
-  return yyd - 1;
+    return yyd - 1;
 }
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef yytnamerr
+#ifndef yytnamerr
 /* Copy to YYRES the contents of YYSTR after stripping away unnecessary
    quotes and backslashes, so that it's suitable for yyerror.  The
    heuristic is that double-quoting is unnecessary unless the string
@@ -1042,44 +961,42 @@ yystpcpy (char *yydest, const char *yysrc)
    null, do not copy; instead, return the length of what the result
    would have been.  */
 static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
+yytnamerr(char *yyres, const char *yystr)
 {
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
+    if (*yystr == '"') {
+        YYSIZE_T    yyn = 0;
+        char const *yyp = yystr;
+
+        for (;;)
+            switch (*++yyp) {
+                case '\'':
+                case ',':
+                    goto do_not_strip_quotes;
+
+                case '\\':
+                    if (*++yyp != '\\')
+                        goto do_not_strip_quotes;
+                    /* Fall through.  */
+                default:
+                    if (yyres)
+                        yyres[yyn] = *yyp;
+                    yyn++;
+                    break;
 
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
+                case '"':
+                    if (yyres)
+                        yyres[yyn] = '\0';
+                    return yyn;
+            }
+do_not_strip_quotes:;
     }
 
-  if (! yyres)
-    return yystrlen (yystr);
+    if (!yyres)
+        return yystrlen(yystr);
 
-  return yystpcpy (yyres, yystr) - yyres;
+    return yystpcpy(yyres, yystr) - yyres;
 }
-# endif
+#endif
 
 /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
    about the unexpected token YYTOKEN for the state stack whose top is
@@ -1090,130 +1007,119 @@ yytnamerr (char *yyres, const char *yystr)
    *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
    required number of bytes is too large to store.  */
 static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+yysyntax_error(YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
+    YYSIZE_T yysize0 = yytnamerr(YY_NULLPTR, yytname[yytoken]);
+    YYSIZE_T yysize  = yysize0;
+    enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+    /* Internationalized format string. */
+    const char *yyformat = YY_NULLPTR;
+    /* Arguments of yyformat. */
+    char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+    /* Number of reported tokens (one for the "unexpected", one per
+       "expected"). */
+    int yycount = 0;
+
+    /* There are many possibilities here to consider:
+       - If this state is a consistent state with a default action, then
+         the only way this function was invoked is if the default action
+         is an error action.  In that case, don't check for expected
+         tokens because there are none.
+       - The only way there can be no lookahead present (in yychar) is if
+         this state is a consistent state with a default action.  Thus,
+         detecting the absence of a lookahead is sufficient to determine
+         that there is no unexpected or expected token to report.  In that
+         case, just report a simple "syntax error".
+       - Don't assume there isn't a lookahead just because this state is a
+         consistent state with a default action.  There might have been a
+         previous inconsistent state, consistent state with a non-default
+         action, or user semantic action that manipulated yychar.
+       - Of course, the expected token list depends on states to have
+         correct lookahead information, and it depends on the parser not
+         to perform extra reductions after fetching a lookahead from the
+         scanner and before detecting a syntax error.  Thus, state merging
+         (from LALR or IELR) and default reductions corrupt the expected
+         token list.  However, the list is correct for canonical LR with
+         one exception: it will still contain any token that will not be
+         accepted due to an error action in a later state.
+    */
+    if (yytoken != YYEMPTY) {
+        int yyn          = yypact[*yyssp];
+        yyarg[yycount++] = yytname[yytoken];
+        if (!yypact_value_is_default(yyn)) {
+            /* Start YYX at -YYN if negative to avoid negative indexes in
+               YYCHECK.  In other words, skip the first -YYN actions for
+               this state because they are default actions.  */
+            int yyxbegin = yyn < 0 ? -yyn : 0;
+            /* Stay within bounds of both yycheck and yytname.  */
+            int yychecklim = YYLAST - yyn + 1;
+            int yyxend     = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+            int yyx;
+
+            for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+                if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR &&
+                    !yytable_value_is_error(yytable[yyx + yyn])) {
+                    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) {
+                        yycount = 1;
+                        yysize  = yysize0;
+                        break;
+                    }
+                    yyarg[yycount++] = yytname[yyx];
+                    {
+                        YYSIZE_T yysize1 = yysize + yytnamerr(YY_NULLPTR, yytname[yyx]);
+                        if (!(yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                            return 2;
+                        yysize = yysize1;
+                    }
                 }
-              }
         }
     }
 
-  switch (yycount)
+    switch (yycount) {
+#define YYCASE_(N, S)                                                                                        \
+    case N:                                                                                                  \
+        yyformat = S;                                                                                        \
+        break
+        YYCASE_(0, YY_("syntax error"));
+        YYCASE_(1, YY_("syntax error, unexpected %s"));
+        YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+        YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+        YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+        YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+#undef YYCASE_
+    }
+
     {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
+        YYSIZE_T yysize1 = yysize + yystrlen(yyformat);
+        if (!(yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+            return 2;
+        yysize = yysize1;
     }
 
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
+    if (*yymsg_alloc < yysize) {
+        *yymsg_alloc = 2 * yysize;
+        if (!(yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+            *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+        return 1;
+    }
 
-  if (*yymsg_alloc < yysize)
+    /* Avoid sprintf, as that infringes on the user's name space.
+       Don't have undefined behavior even if the translation
+       produced a string with the wrong number of "%s"s.  */
     {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
+        char *yyp = *yymsg;
+        int   yyi = 0;
+        while ((*yyp = *yyformat) != '\0')
+            if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) {
+                yyp += yytnamerr(yyp, yyarg[yyi++]);
+                yyformat += 2;
+            }
+            else {
+                yyp++;
+                yyformat++;
+            }
     }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+    return 0;
 }
 #endif /* YYERROR_VERBOSE */
 
@@ -1222,21 +1128,18 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
 `-----------------------------------------------*/
 
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct(const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 {
-  YYUSE (yyvaluep);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+    YYUSE(yyvaluep);
+    if (!yymsg)
+        yymsg = "Deleting";
+    YY_SYMBOL_PRINT(yymsg, yytype, yyvaluep, yylocationp);
+
+    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+    YYUSE(yytype);
+    YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
-
-
-
 /* The lookahead symbol.  */
 int yychar;
 
@@ -1245,13 +1148,12 @@ YYSTYPE yylval;
 /* Number of syntax errors so far.  */
 int yynerrs;
 
-
 /*----------.
 | yyparse.  |
 `----------*/
 
 hid_t
-yyparse (void)
+yyparse(void)
 {
     int yystate;
     /* Number of tokens to shift before error messages enabled.  */
@@ -1265,1025 +1167,1117 @@ yyparse (void)
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16  yyssa[YYINITDEPTH];
     yytype_int16 *yyss;
     yytype_int16 *yyssp;
 
     /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE  yyvsa[YYINITDEPTH];
     YYSTYPE *yyvs;
     YYSTYPE *yyvsp;
 
     YYSIZE_T yystacksize;
 
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
+    int yyn;
+    int yyresult;
+    /* Lookahead token as an internal (translated) token number.  */
+    int yytoken = 0;
+    /* The variables used to return semantic value and location from the
+       action routines.  */
+    YYSTYPE yyval;
 
 #if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+    /* Buffer for error messages, and its allocated size.  */
+    char     yymsgbuf[128];
+    char *   yymsg       = yymsgbuf;
+    YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
 
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
+    /* The number of symbols on the RHS of the reduced rule.
+       Keep to zero when no symbol should be popped.  */
+    int yylen = 0;
 
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
+    yyssp = yyss = yyssa;
+    yyvsp = yyvs = yyvsa;
+    yystacksize  = YYINITDEPTH;
 
-  YYDPRINTF ((stderr, "Starting parse\n"));
+    YYDPRINTF((stderr, "Starting parse\n"));
 
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-  goto yysetstate;
+    yystate     = 0;
+    yyerrstatus = 0;
+    yynerrs     = 0;
+    yychar      = YYEMPTY; /* Cause a token to be read.  */
+    goto yysetstate;
 
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
+    /*------------------------------------------------------------.
+    | yynewstate -- Push a new state, which is found in yystate.  |
+    `------------------------------------------------------------*/
+yynewstate:
+    /* In all cases, when you get here, the value and location stacks
+       have just been pushed.  So pushing a state here evens the stacks.  */
+    yyssp++;
 
- yysetstate:
-  *yyssp = yystate;
+yysetstate:
+    *yyssp = yystate;
 
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
+    if (yyss + yystacksize - 1 <= yyssp) {
+        /* Get the current used size of the three stacks, in elements.  */
+        YYSIZE_T yysize = yyssp - yyss + 1;
 
 #ifdef yyoverflow
-      {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
+        {
+            /* Give user a chance to reallocate the stack.  Use copies of
+               these so that the &'s don't force the real ones into
+               memory.  */
+            YYSTYPE *     yyvs1 = yyvs;
+            yytype_int16 *yyss1 = yyss;
+
+            /* Each stack pointer address is followed by the size of the
+               data in use in that stack, in bytes.  This used to be a
+               conditional around just the two extra args, but that might
+               be undefined if yyoverflow is a macro.  */
+            yyoverflow(YY_("memory exhausted"), &yyss1, yysize * sizeof(*yyssp), &yyvs1,
+                       yysize * sizeof(*yyvsp), &yystacksize);
+
+            yyss = yyss1;
+            yyvs = yyvs1;
+        }
 #else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
+#ifndef YYSTACK_RELOCATE
         goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
+#else
+        /* Extend the stack our own way.  */
+        if (YYMAXDEPTH <= yystacksize)
+            goto yyexhaustedlab;
+        yystacksize *= 2;
+        if (YYMAXDEPTH < yystacksize)
+            yystacksize = YYMAXDEPTH;
+
+        {
+            yytype_int16 * yyss1 = yyss;
+            union yyalloc *yyptr = (union yyalloc *)YYSTACK_ALLOC(YYSTACK_BYTES(yystacksize));
+            if (!yyptr)
+                goto yyexhaustedlab;
+            YYSTACK_RELOCATE(yyss_alloc, yyss);
+            YYSTACK_RELOCATE(yyvs_alloc, yyvs);
+#undef YYSTACK_RELOCATE
+            if (yyss1 != yyssa)
+                YYSTACK_FREE(yyss1);
+        }
+#endif
 #endif /* no yyoverflow */
 
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
+        yyssp = yyss + yysize - 1;
+        yyvsp = yyvs + yysize - 1;
 
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
+        YYDPRINTF((stderr, "Stack size increased to %lu\n", (unsigned long int)yystacksize));
 
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
+        if (yyss + yystacksize - 1 <= yyssp)
+            YYABORT;
     }
 
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+    YYDPRINTF((stderr, "Entering state %d\n", yystate));
 
-  if (yystate == YYFINAL)
-    YYACCEPT;
+    if (yystate == YYFINAL)
+        YYACCEPT;
 
-  goto yybackup;
+    goto yybackup;
 
 /*-----------.
 | yybackup.  |
 `-----------*/
 yybackup:
 
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
+    /* Do appropriate processing given the current state.  Read a
+       lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
+    /* First try to decide what to do without reference to lookahead token.  */
+    yyn = yypact[yystate];
+    if (yypact_value_is_default(yyn))
+        goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+    /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex ();
+    /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+    if (yychar == YYEMPTY) {
+        YYDPRINTF((stderr, "Reading a token: "));
+        yychar = yylex();
     }
 
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    if (yychar <= YYEOF) {
+        yychar = yytoken = YYEOF;
+        YYDPRINTF((stderr, "Now at end of input.\n"));
     }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    else {
+        yytoken = YYTRANSLATE(yychar);
+        YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
     }
 
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
+    /* If the proper action on seeing token YYTOKEN is to reduce or to
+       detect an error, take that action.  */
+    yyn += yytoken;
+    if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+        goto yydefault;
+    yyn = yytable[yyn];
+    if (yyn <= 0) {
+        if (yytable_value_is_error(yyn))
+            goto yyerrlab;
+        yyn = -yyn;
+        goto yyreduce;
     }
 
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+    /* Count tokens shifted since error; after three, turn off error
+       status.  */
+    if (yyerrstatus)
+        yyerrstatus--;
 
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
+    /* Shift the lookahead token.  */
+    YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
 
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
+    /* Discard the shifted token.  */
+    yychar = YYEMPTY;
 
-  goto yynewstate;
+    yystate = yyn;
+    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+    *++yyvsp = yylval;
+    YY_IGNORE_MAYBE_UNINITIALIZED_END
 
+    goto yynewstate;
 
 /*-----------------------------------------------------------.
 | yydefault -- do the default action for the current state.  |
 `-----------------------------------------------------------*/
 yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
+    yyn = yydefact[yystate];
+    if (yyn == 0)
+        goto yyerrlab;
+    goto yyreduce;
 
 /*-----------------------------.
 | yyreduce -- Do a reduction.  |
 `-----------------------------*/
 yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
+    /* yyn is the number of a rule to reduce with.  */
+    yylen = yyr2[yyn];
 
-  /* If YYLEN is nonzero, implement the default value of the action:
-     '$$ = $1'.
+    /* If YYLEN is nonzero, implement the default value of the action:
+       '$$ = $1'.
 
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
+       Otherwise, the following line sets YYVAL to garbage.
+       This behavior is undocumented and Bison
+       users should not rely upon it.  Assigning to YYVAL
+       unconditionally makes the parser a bit smaller, and it avoids a
+       GCC warning that YYVAL may be used uninitialized.  */
+    yyval = yyvsp[1 - yylen];
 
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
+    YY_REDUCE_PRINT(yyn);
+    switch (yyn) {
         case 2:
 #line 105 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
+        {
+            memset(arr_stack, 0, STACK_SIZE * sizeof(struct arr_info)); /*initialize here?*/
+        }
 #line 1470 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 3:
+        case 3:
 #line 106 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { return (yyval.hid);}
+        {
+            return (yyval.hid);
+        }
 #line 1476 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 13:
+        case 13:
 #line 120 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I8BE);
+        }
 #line 1482 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 14:
+        case 14:
 #line 121 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I8LE);
+        }
 #line 1488 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 15:
+        case 15:
 #line 122 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I16BE);
+        }
 #line 1494 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 16:
+        case 16:
 #line 123 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I16LE);
+        }
 #line 1500 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 17:
+        case 17:
 #line 124 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I32BE);
+        }
 #line 1506 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 18:
+        case 18:
 #line 125 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I32LE);
+        }
 #line 1512 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 19:
+        case 19:
 #line 126 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I64BE);
+        }
 #line 1518 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 20:
+        case 20:
 #line 127 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_I64LE);
+        }
 #line 1524 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 21:
+        case 21:
 #line 128 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U8BE);
+        }
 #line 1530 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 22:
+        case 22:
 #line 129 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U8LE);
+        }
 #line 1536 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 23:
+        case 23:
 #line 130 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U16BE);
+        }
 #line 1542 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 24:
+        case 24:
 #line 131 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U16LE);
+        }
 #line 1548 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 25:
+        case 25:
 #line 132 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U32BE);
+        }
 #line 1554 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 26:
+        case 26:
 #line 133 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U32LE);
+        }
 #line 1560 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 27:
+        case 27:
 #line 134 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U64BE);
+        }
 #line 1566 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 28:
+        case 28:
 #line 135 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_STD_U64LE);
+        }
 #line 1572 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 29:
+        case 29:
 #line 136 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR);
+        }
 #line 1578 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 30:
+        case 30:
 #line 137 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR);
+        }
 #line 1584 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 31:
+        case 31:
 #line 138 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR);
+        }
 #line 1590 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 32:
+        case 32:
 #line 139 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT);
+        }
 #line 1596 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 33:
+        case 33:
 #line 140 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT);
+        }
 #line 1602 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 34:
+        case 34:
 #line 141 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_INT);
+        }
 #line 1608 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 35:
+        case 35:
 #line 142 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT);
+        }
 #line 1614 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 36:
+        case 36:
 #line 143 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG);
+        }
 #line 1620 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 37:
+        case 37:
 #line 144 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG);
+        }
 #line 1626 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 38:
+        case 38:
 #line 145 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG);
+        }
 #line 1632 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 39:
+        case 39:
 #line 146 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG);
+        }
 #line 1638 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 40:
+        case 40:
 #line 149 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE);
+        }
 #line 1644 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 41:
+        case 41:
 #line 150 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE);
+        }
 #line 1650 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 42:
+        case 42:
 #line 151 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE);
+        }
 #line 1656 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 43:
+        case 43:
 #line 152 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE);
+        }
 #line 1662 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 44:
+        case 44:
 #line 153 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT);
+        }
 #line 1668 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 45:
+        case 45:
 #line 154 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE);
+        }
 #line 1674 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 46:
+        case 46:
 #line 155 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
+        {
+            (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE);
+        }
 #line 1680 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 47:
+        case 47:
 #line 159 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ }
+        {
+            csindex++;
+            cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/
+        }
 #line 1686 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 48:
+        case 48:
 #line 161 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = cmpd_stack[csindex].id; 
-                              cmpd_stack[csindex].id = 0;
-                              cmpd_stack[csindex].first_memb = 1; 
-                              csindex--;
-                            }
+        {
+            (yyval.hid)                    = cmpd_stack[csindex].id;
+            cmpd_stack[csindex].id         = 0;
+            cmpd_stack[csindex].first_memb = 1;
+            csindex--;
+        }
 #line 1696 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 51:
+        case 51:
 #line 170 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ }
+        {
+            cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/
+        }
 #line 1702 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 52:
+        case 52:
 #line 172 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {   
-                            size_t origin_size, new_size;
-                            hid_t dtype_id = cmpd_stack[csindex].id;
-
-                            /*Adjust size and insert member, consider both member size and offset.*/
-                            if(cmpd_stack[csindex].first_memb) { /*reclaim the size 1 temporarily set*/
-                                new_size = H5Tget_size((yyvsp[-6].hid)) + (yyvsp[-1].ival);
-                                H5Tset_size(dtype_id, new_size);
-                                /*member name is saved in yylval.sval by lexer*/
-                                H5Tinsert(dtype_id, (yyvsp[-3].sval), (yyvsp[-1].ival), (yyvsp[-6].hid));
-
-                                cmpd_stack[csindex].first_memb = 0;
-                            } else {
-                                origin_size = H5Tget_size(dtype_id);
-                                
-                                if((yyvsp[-1].ival) == 0) {
-                                    new_size = origin_size + H5Tget_size((yyvsp[-6].hid));
-                                    H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, (yyvsp[-3].sval), origin_size, (yyvsp[-6].hid));
-                                } else {
-                                    new_size = (yyvsp[-1].ival) + H5Tget_size((yyvsp[-6].hid));
-                                    H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, (yyvsp[-3].sval), (yyvsp[-1].ival), (yyvsp[-6].hid));
-                                }
-                            }
-                            if((yyvsp[-3].sval)) {
-                                free((yyvsp[-3].sval));
-                                (yyvsp[-3].sval) = NULL;
-                            }
-                            cmpd_stack[csindex].is_field = 0;
-                            H5Tclose((yyvsp[-6].hid));
-                             
-                            new_size = H5Tget_size(dtype_id);
-                        }
+        {
+            size_t origin_size, new_size;
+            hid_t  dtype_id = cmpd_stack[csindex].id;
+
+            /*Adjust size and insert member, consider both member size and offset.*/
+            if (cmpd_stack[csindex].first_memb) { /*reclaim the size 1 temporarily set*/
+                new_size = H5Tget_size((yyvsp[-6].hid)) + (yyvsp[-1].ival);
+                H5Tset_size(dtype_id, new_size);
+                /*member name is saved in yylval.sval by lexer*/
+                H5Tinsert(dtype_id, (yyvsp[-3].sval), (yyvsp[-1].ival), (yyvsp[-6].hid));
+
+                cmpd_stack[csindex].first_memb = 0;
+            }
+            else {
+                origin_size = H5Tget_size(dtype_id);
+
+                if ((yyvsp[-1].ival) == 0) {
+                    new_size = origin_size + H5Tget_size((yyvsp[-6].hid));
+                    H5Tset_size(dtype_id, new_size);
+                    H5Tinsert(dtype_id, (yyvsp[-3].sval), origin_size, (yyvsp[-6].hid));
+                }
+                else {
+                    new_size = (yyvsp[-1].ival) + H5Tget_size((yyvsp[-6].hid));
+                    H5Tset_size(dtype_id, new_size);
+                    H5Tinsert(dtype_id, (yyvsp[-3].sval), (yyvsp[-1].ival), (yyvsp[-6].hid));
+                }
+            }
+            if ((yyvsp[-3].sval)) {
+                free((yyvsp[-3].sval));
+                (yyvsp[-3].sval) = NULL;
+            }
+            cmpd_stack[csindex].is_field = 0;
+            H5Tclose((yyvsp[-6].hid));
+
+            new_size = H5Tget_size(dtype_id);
+        }
 #line 1741 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 53:
+        case 53:
 #line 208 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {
-                            (yyval.sval) = strdup(yylval.sval);
-                            free(yylval.sval);
-                            yylval.sval = NULL;
-                        }
+        {
+            (yyval.sval) = strdup(yylval.sval);
+            free(yylval.sval);
+            yylval.sval = NULL;
+        }
 #line 1751 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 54:
+        case 54:
 #line 215 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.ival) = 0; }
+        {
+            (yyval.ival) = 0;
+        }
 #line 1757 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 55:
+        case 55:
 #line 217 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.ival) = yylval.ival; }
+        {
+            (yyval.ival) = yylval.ival;
+        }
 #line 1763 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 57:
+        case 57:
 #line 221 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { asindex++; /*pushd onto the stack*/ }
+        {
+            asindex++; /*pushd onto the stack*/
+        }
 #line 1769 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 58:
+        case 58:
 #line 223 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { 
-                          (yyval.hid) = H5Tarray_create2((yyvsp[-1].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
-                          arr_stack[asindex].ndims = 0;
-                          asindex--;
-                          H5Tclose((yyvsp[-1].hid));
-                        }
+        {
+            (yyval.hid) =
+                H5Tarray_create2((yyvsp[-1].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
+            arr_stack[asindex].ndims = 0;
+            asindex--;
+            H5Tclose((yyvsp[-1].hid));
+        }
 #line 1780 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 61:
+        case 61:
 #line 233 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ }
+        {
+            arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/
+        }
 #line 1786 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 62:
+        case 62:
 #line 234 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { unsigned ndims = arr_stack[asindex].ndims;
-                                  arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; 
-                                  arr_stack[asindex].ndims++;
-                                  arr_stack[asindex].is_dim = 0; 
-                                }
+        {
+            unsigned ndims                 = arr_stack[asindex].ndims;
+            arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival;
+            arr_stack[asindex].ndims++;
+            arr_stack[asindex].is_dim = 0;
+        }
 #line 1796 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 65:
+        case 65:
 #line 245 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = H5Tvlen_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); }
+        {
+            (yyval.hid) = H5Tvlen_create((yyvsp[-1].hid));
+            H5Tclose((yyvsp[-1].hid));
+        }
 #line 1802 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 66:
+        case 66:
 #line 250 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { is_opq_size = 1; }
+        {
+            is_opq_size = 1;
+        }
 #line 1808 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 67:
+        case 67:
 #line 251 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {   
-                                size_t size = (size_t)yylval.ival;
-                                (yyval.hid) = H5Tcreate(H5T_OPAQUE, size);
-                                is_opq_size = 0;    
-                            }
+        {
+            size_t size = (size_t)yylval.ival;
+            (yyval.hid) = H5Tcreate(H5T_OPAQUE, size);
+            is_opq_size = 0;
+        }
 #line 1818 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 68:
+        case 68:
 #line 256 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { is_opq_tag = 1; }
+        {
+            is_opq_tag = 1;
+        }
 #line 1824 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 69:
+        case 69:
 #line 257 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {  
-                                H5Tset_tag((yyvsp[-6].hid), yylval.sval);
-                                free(yylval.sval);
-                                yylval.sval = NULL;
-                                is_opq_tag = 0;
-                            }
+        {
+            H5Tset_tag((yyvsp[-6].hid), yylval.sval);
+            free(yylval.sval);
+            yylval.sval = NULL;
+            is_opq_tag  = 0;
+        }
 #line 1835 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 70:
+        case 70:
 #line 263 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { (yyval.hid) = (yyvsp[-8].hid); }
+        {
+            (yyval.hid) = (yyvsp[-8].hid);
+        }
 #line 1841 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 73:
+        case 73:
 #line 271 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { is_str_size = 1; }
+        {
+            is_str_size = 1;
+        }
 #line 1847 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 74:
+        case 74:
 #line 272 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {  
-                                if((yyvsp[-1].ival) == H5T_VARIABLE_TOKEN)
-                                    is_variable = 1;
-                                else 
-                                    str_size = yylval.ival;
-                                is_str_size = 0; 
-                            }
+        {
+            if ((yyvsp[-1].ival) == H5T_VARIABLE_TOKEN)
+                is_variable = 1;
+            else
+                str_size = yylval.ival;
+            is_str_size = 0;
+        }
 #line 1859 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 75:
+        case 75:
 #line 280 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {
-                                if((yyvsp[-1].ival) == H5T_STR_NULLTERM_TOKEN)
-                                    str_pad = H5T_STR_NULLTERM;
-                                else if((yyvsp[-1].ival) == H5T_STR_NULLPAD_TOKEN)
-                                    str_pad = H5T_STR_NULLPAD;
-                                else if((yyvsp[-1].ival) == H5T_STR_SPACEPAD_TOKEN)
-                                    str_pad = H5T_STR_SPACEPAD;
-                            }
+        {
+            if ((yyvsp[-1].ival) == H5T_STR_NULLTERM_TOKEN)
+                str_pad = H5T_STR_NULLTERM;
+            else if ((yyvsp[-1].ival) == H5T_STR_NULLPAD_TOKEN)
+                str_pad = H5T_STR_NULLPAD;
+            else if ((yyvsp[-1].ival) == H5T_STR_SPACEPAD_TOKEN)
+                str_pad = H5T_STR_SPACEPAD;
+        }
 #line 1872 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 76:
+        case 76:
 #line 289 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {  
-                                if((yyvsp[-1].ival) == H5T_CSET_ASCII_TOKEN)
-                                    str_cset = H5T_CSET_ASCII;
-                                else if((yyvsp[-1].ival) == H5T_CSET_UTF8_TOKEN)
-                                    str_cset = H5T_CSET_UTF8;
-                            }
+        {
+            if ((yyvsp[-1].ival) == H5T_CSET_ASCII_TOKEN)
+                str_cset = H5T_CSET_ASCII;
+            else if ((yyvsp[-1].ival) == H5T_CSET_UTF8_TOKEN)
+                str_cset = H5T_CSET_UTF8;
+        }
 #line 1883 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 77:
+        case 77:
 #line 296 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {
-                                if((yyvsp[-1].hid) == H5T_C_S1_TOKEN)
-                                    (yyval.hid) = H5Tcopy(H5T_C_S1);
-                                else if((yyvsp[-1].hid) == H5T_FORTRAN_S1_TOKEN)
-                                    (yyval.hid) = H5Tcopy(H5T_FORTRAN_S1);
-                            }
+        {
+            if ((yyvsp[-1].hid) == H5T_C_S1_TOKEN)
+                (yyval.hid) = H5Tcopy(H5T_C_S1);
+            else if ((yyvsp[-1].hid) == H5T_FORTRAN_S1_TOKEN)
+                (yyval.hid) = H5Tcopy(H5T_FORTRAN_S1);
+        }
 #line 1894 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 78:
+        case 78:
 #line 303 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {   
-                                hid_t str_id = (yyvsp[-1].hid);
-
-                                /*set string size*/
-                                if(is_variable) {
-                                    H5Tset_size(str_id, H5T_VARIABLE);
-                                    is_variable = 0;
-                                } else
-                                    H5Tset_size(str_id, str_size);
-                                
-                                /*set string padding and character set*/
-                                H5Tset_strpad(str_id, str_pad);
-                                H5Tset_cset(str_id, str_cset);
-
-                                (yyval.hid) = str_id; 
-                            }
+        {
+            hid_t str_id = (yyvsp[-1].hid);
+
+            /*set string size*/
+            if (is_variable) {
+                H5Tset_size(str_id, H5T_VARIABLE);
+                is_variable = 0;
+            }
+            else
+                H5Tset_size(str_id, str_size);
+
+            /*set string padding and character set*/
+            H5Tset_strpad(str_id, str_pad);
+            H5Tset_cset(str_id, str_cset);
+
+            (yyval.hid) = str_id;
+        }
 #line 1915 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 79:
+        case 79:
 #line 320 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.ival) = H5T_VARIABLE_TOKEN;}
+        {
+            (yyval.ival) = H5T_VARIABLE_TOKEN;
+        }
 #line 1921 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 81:
+        case 81:
 #line 323 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
+        {
+            (yyval.ival) = H5T_STR_NULLTERM_TOKEN;
+        }
 #line 1927 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 82:
+        case 82:
 #line 324 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
+        {
+            (yyval.ival) = H5T_STR_NULLPAD_TOKEN;
+        }
 #line 1933 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 83:
+        case 83:
 #line 325 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
+        {
+            (yyval.ival) = H5T_STR_SPACEPAD_TOKEN;
+        }
 #line 1939 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 84:
+        case 84:
 #line 327 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
+        {
+            (yyval.ival) = H5T_CSET_ASCII_TOKEN;
+        }
 #line 1945 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 85:
+        case 85:
 #line 328 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
+        {
+            (yyval.ival) = H5T_CSET_UTF8_TOKEN;
+        }
 #line 1951 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 86:
+        case 86:
 #line 330 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.hid) = H5T_C_S1_TOKEN;}
+        {
+            (yyval.hid) = H5T_C_S1_TOKEN;
+        }
 #line 1957 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 87:
+        case 87:
 #line 331 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
+        {
+            (yyval.hid) = H5T_FORTRAN_S1_TOKEN;
+        }
 #line 1963 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 88:
+        case 88:
 #line 335 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { is_enum = 1; enum_id = H5Tenum_create((yyvsp[-1].hid)); H5Tclose((yyvsp[-1].hid)); }
+        {
+            is_enum = 1;
+            enum_id = H5Tenum_create((yyvsp[-1].hid));
+            H5Tclose((yyvsp[-1].hid));
+        }
 #line 1969 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 89:
+        case 89:
 #line 337 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
+        {
+            is_enum     = 0; /*reset*/
+            (yyval.hid) = enum_id;
+        }
 #line 1975 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 92:
+        case 92:
 #line 342 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {
-                                                is_enum_memb = 1; /*indicate member of enum*/
+        {
+            is_enum_memb = 1; /*indicate member of enum*/
 #ifdef H5_HAVE_WIN32_API
-                                                enum_memb_symbol = _strdup(yylval.sval); 
-#else /* H5_HAVE_WIN32_API */
-                                                enum_memb_symbol = strdup(yylval.sval); 
-#endif  /* H5_HAVE_WIN32_API */
-                                                free(yylval.sval);
-                                                yylval.sval = NULL;
-                                            }
+            enum_memb_symbol = _strdup(yylval.sval);
+#else  /* H5_HAVE_WIN32_API */
+            enum_memb_symbol = strdup(yylval.sval);
+#endif /* H5_HAVE_WIN32_API */
+            free(yylval.sval);
+            yylval.sval = NULL;
+        }
 #line 1990 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        break;
 
-  case 93:
+        case 93:
 #line 353 "hl/src/H5LTparse.y" /* yacc.c:1646  */
-    {
-                                char char_val=(char)yylval.ival;
-                                short short_val=(short)yylval.ival;
-                                int int_val=(int)yylval.ival;
-                                long long_val=(long)yylval.ival;
-                                long long llong_val=(long long)yylval.ival;
-                                hid_t super = H5Tget_super(enum_id);
-                                hid_t native = H5Tget_native_type(super, H5T_DIR_ASCEND);
-                                H5T_order_t super_order = H5Tget_order(super);
-                                H5T_order_t native_order = H5Tget_order(native);
- 
-                                if(is_enum && is_enum_memb) { /*if it's an enum member*/
-                                    /*To handle machines of different endianness*/
-                                    if(H5Tequal(native, H5T_NATIVE_SCHAR) || H5Tequal(native, H5T_NATIVE_UCHAR)) {
-                                        if(super_order != native_order)
-                                            H5Tconvert(native, super, 1, &char_val, NULL, H5P_DEFAULT); 
-                                        H5Tenum_insert(enum_id, enum_memb_symbol, &char_val);
-                                    } else if(H5Tequal(native, H5T_NATIVE_SHORT) || H5Tequal(native, H5T_NATIVE_USHORT)) {
-                                        if(super_order != native_order)
-                                            H5Tconvert(native, super, 1, &short_val, NULL, H5P_DEFAULT); 
-                                        H5Tenum_insert(enum_id, enum_memb_symbol, &short_val);
-                                    } else if(H5Tequal(native, H5T_NATIVE_INT) || H5Tequal(native, H5T_NATIVE_UINT)) {
-                                        if(super_order != native_order)
-                                            H5Tconvert(native, super, 1, &int_val, NULL, H5P_DEFAULT); 
-                                        H5Tenum_insert(enum_id, enum_memb_symbol, &int_val);
-                                    } else if(H5Tequal(native, H5T_NATIVE_LONG) || H5Tequal(native, H5T_NATIVE_ULONG)) {
-                                        if(super_order != native_order)
-                                            H5Tconvert(native, super, 1, &long_val, NULL, H5P_DEFAULT); 
-                                        H5Tenum_insert(enum_id, enum_memb_symbol, &long_val);
-                                    } else if(H5Tequal(native, H5T_NATIVE_LLONG) || H5Tequal(native, H5T_NATIVE_ULLONG)) {
-                                        if(super_order != native_order)
-                                            H5Tconvert(native, super, 1, &llong_val, NULL, H5P_DEFAULT); 
-                                        H5Tenum_insert(enum_id, enum_memb_symbol, &llong_val);
-                                    }
-
-                                    is_enum_memb = 0; 
-                                    if(enum_memb_symbol) free(enum_memb_symbol);
-                                }
-
-                                H5Tclose(super);
-                                H5Tclose(native);
-                            }
-#line 2037 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-    break;
+        {
+            char        char_val     = (char)yylval.ival;
+            short       short_val    = (short)yylval.ival;
+            int         int_val      = (int)yylval.ival;
+            long        long_val     = (long)yylval.ival;
+            long long   llong_val    = (long long)yylval.ival;
+            hid_t       super        = H5Tget_super(enum_id);
+            hid_t       native       = H5Tget_native_type(super, H5T_DIR_ASCEND);
+            H5T_order_t super_order  = H5Tget_order(super);
+            H5T_order_t native_order = H5Tget_order(native);
+
+            if (is_enum && is_enum_memb) { /*if it's an enum member*/
+                /*To handle machines of different endianness*/
+                if (H5Tequal(native, H5T_NATIVE_SCHAR) || H5Tequal(native, H5T_NATIVE_UCHAR)) {
+                    if (super_order != native_order)
+                        H5Tconvert(native, super, 1, &char_val, NULL, H5P_DEFAULT);
+                    H5Tenum_insert(enum_id, enum_memb_symbol, &char_val);
+                }
+                else if (H5Tequal(native, H5T_NATIVE_SHORT) || H5Tequal(native, H5T_NATIVE_USHORT)) {
+                    if (super_order != native_order)
+                        H5Tconvert(native, super, 1, &short_val, NULL, H5P_DEFAULT);
+                    H5Tenum_insert(enum_id, enum_memb_symbol, &short_val);
+                }
+                else if (H5Tequal(native, H5T_NATIVE_INT) || H5Tequal(native, H5T_NATIVE_UINT)) {
+                    if (super_order != native_order)
+                        H5Tconvert(native, super, 1, &int_val, NULL, H5P_DEFAULT);
+                    H5Tenum_insert(enum_id, enum_memb_symbol, &int_val);
+                }
+                else if (H5Tequal(native, H5T_NATIVE_LONG) || H5Tequal(native, H5T_NATIVE_ULONG)) {
+                    if (super_order != native_order)
+                        H5Tconvert(native, super, 1, &long_val, NULL, H5P_DEFAULT);
+                    H5Tenum_insert(enum_id, enum_memb_symbol, &long_val);
+                }
+                else if (H5Tequal(native, H5T_NATIVE_LLONG) || H5Tequal(native, H5T_NATIVE_ULLONG)) {
+                    if (super_order != native_order)
+                        H5Tconvert(native, super, 1, &llong_val, NULL, H5P_DEFAULT);
+                    H5Tenum_insert(enum_id, enum_memb_symbol, &llong_val);
+                }
 
+                is_enum_memb = 0;
+                if (enum_memb_symbol)
+                    free(enum_memb_symbol);
+            }
+
+            H5Tclose(super);
+            H5Tclose(native);
+        }
+#line 2037 "hl/src/H5LTparse.c" /* yacc.c:1646  */
+        break;
 
 #line 2041 "hl/src/H5LTparse.c" /* yacc.c:1646  */
-      default: break;
+        default:
+            break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-  /* Now 'shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
+    /* User semantic actions sometimes alter yychar, and that requires
+       that yytoken be updated with the new translation.  We take the
+       approach of translating immediately before every use of yytoken.
+       One alternative is translating here after every semantic action,
+       but that translation would be missed if the semantic action invokes
+       YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+       if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+       incorrect destructor might then be invoked immediately.  In the
+       case of YYERROR or YYBACKUP, subsequent parser actions might lead
+       to an incorrect destructor call or verbose syntax error message
+       before the lookahead is translated.  */
+    YY_SYMBOL_PRINT("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+    YYPOPSTACK(yylen);
+    yylen = 0;
+    YY_STACK_PRINT(yyss, yyssp);
+
+    *++yyvsp = yyval;
+
+    /* Now 'shift' the result of the reduction.  Determine what state
+       that goes to, based on the state we popped back to and the rule
+       number reduced by.  */
+
+    yyn = yyr1[yyn];
+
+    yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+    if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+        yystate = yytable[yystate];
+    else
+        yystate = yydefgoto[yyn - YYNTOKENS];
+
+    goto yynewstate;
 
 /*--------------------------------------.
 | yyerrlab -- here on detecting error.  |
 `--------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
+    /* Make sure we have latest lookahead translation.  See comments at
+       user semantic actions for why this is necessary.  */
+    yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE(yychar);
+
+    /* If not already recovering from an error, report this error.  */
+    if (!yyerrstatus) {
+        ++yynerrs;
+#if !YYERROR_VERBOSE
+        yyerror(YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
+#define YYSYNTAX_ERROR yysyntax_error(&yymsg_alloc, &yymsg, yyssp, yytoken)
+        {
+            char const *yymsgp = YY_("syntax error");
+            int         yysyntax_error_status;
+            yysyntax_error_status = YYSYNTAX_ERROR;
+            if (yysyntax_error_status == 0)
                 yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
+            else if (yysyntax_error_status == 1) {
+                if (yymsg != yymsgbuf)
+                    YYSTACK_FREE(yymsg);
+                yymsg = (char *)YYSTACK_ALLOC(yymsg_alloc);
+                if (!yymsg) {
+                    yymsg                 = yymsgbuf;
+                    yymsg_alloc           = sizeof yymsgbuf;
+                    yysyntax_error_status = 2;
+                }
+                else {
+                    yysyntax_error_status = YYSYNTAX_ERROR;
+                    yymsgp                = yymsg;
+                }
+            }
+            yyerror(yymsgp);
+            if (yysyntax_error_status == 2)
+                goto yyexhaustedlab;
+        }
+#undef YYSYNTAX_ERROR
 #endif
     }
 
+    if (yyerrstatus == 3) {
+        /* If just tried and failed to reuse lookahead token after an
+           error, discard it.  */
 
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
+        if (yychar <= YYEOF) {
+            /* Return failure if at end of input.  */
+            if (yychar == YYEOF)
+                YYABORT;
         }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval);
-          yychar = YYEMPTY;
+        else {
+            yydestruct("Error: discarding", yytoken, &yylval);
+            yychar = YYEMPTY;
         }
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
+    /* Else will try to reuse lookahead token after shifting the error
+       token.  */
+    goto yyerrlab1;
 
 /*---------------------------------------------------.
 | yyerrorlab -- error raised explicitly by YYERROR.  |
 `---------------------------------------------------*/
 yyerrorlab:
 
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
+    /* Pacify compilers like GCC when the user code never invokes
+       YYERROR and the label yyerrorlab therefore never appears in user
+       code.  */
+    if (/*CONSTCOND*/ 0)
+        goto yyerrorlab;
 
+    /* Do not reclaim the symbols of the rule whose action triggered
+       this YYERROR.  */
+    YYPOPSTACK(yylen);
+    yylen = 0;
+    YY_STACK_PRINT(yyss, yyssp);
+    yystate = *yyssp;
+    goto yyerrlab1;
 
 /*-------------------------------------------------------------.
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
+    yyerrstatus = 3; /* Each real token shifted decrements this.  */
+
+    for (;;) {
+        yyn = yypact[yystate];
+        if (!yypact_value_is_default(yyn)) {
+            yyn += YYTERROR;
+            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) {
+                yyn = yytable[yyn];
+                if (0 < yyn)
+                    break;
             }
         }
 
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-
+        /* Pop the current state because it cannot handle the error token.  */
+        if (yyssp == yyss)
+            YYABORT;
 
-      yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
+        yydestruct("Error: popping", yystos[yystate], yyvsp);
+        YYPOPSTACK(1);
+        yystate = *yyssp;
+        YY_STACK_PRINT(yyss, yyssp);
     }
 
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+    YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+    *++yyvsp = yylval;
+    YY_IGNORE_MAYBE_UNINITIALIZED_END
 
-  yystate = yyn;
-  goto yynewstate;
+    /* Shift the error token.  */
+    YY_SYMBOL_PRINT("Shifting", yystos[yyn], yyvsp, yylsp);
 
+    yystate = yyn;
+    goto yynewstate;
 
 /*-------------------------------------.
 | yyacceptlab -- YYACCEPT comes here.  |
 `-------------------------------------*/
 yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
+    yyresult = 0;
+    goto yyreturn;
 
 /*-----------------------------------.
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
+    yyresult = 1;
+    goto yyreturn;
 
 #if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
+    yyerror(YY_("memory exhausted"));
+    yyresult = 2;
+    /* Fall through.  */
 #endif
 
 yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
+    if (yychar != YYEMPTY) {
+        /* Make sure we have latest lookahead translation.  See comments at
+           user semantic actions for why this is necessary.  */
+        yytoken = YYTRANSLATE(yychar);
+        yydestruct("Cleanup: discarding lookahead", yytoken, &yylval);
     }
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
+    /* Do not reclaim the symbols of the rule whose action triggered
+       this YYABORT or YYACCEPT.  */
+    YYPOPSTACK(yylen);
+    YY_STACK_PRINT(yyss, yyssp);
+    while (yyssp != yyss) {
+        yydestruct("Cleanup: popping", yystos[*yyssp], yyvsp);
+        YYPOPSTACK(1);
     }
 #ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
+    if (yyss != yyssa)
+        YYSTACK_FREE(yyss);
 #endif
 #if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
+    if (yymsg != yymsgbuf)
+        YYSTACK_FREE(yymsg);
 #endif
-  return yyresult;
+    return yyresult;
 }
diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h
index e38116a..4855f42 100644
--- a/hl/src/H5LTparse.h
+++ b/hl/src/H5LTparse.h
@@ -31,10 +31,10 @@
    version 2.2 of Bison.  */
 
 #ifndef YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
-# define YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
+#define YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED
 /* Debug traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 0
+#define YYDEBUG 0
 #endif
 #if YYDEBUG
 extern int H5LTyydebug;
@@ -42,90 +42,87 @@ extern int H5LTyydebug;
 
 /* Token type.  */
 #ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    H5T_STD_I8BE_TOKEN = 258,
-    H5T_STD_I8LE_TOKEN = 259,
-    H5T_STD_I16BE_TOKEN = 260,
-    H5T_STD_I16LE_TOKEN = 261,
-    H5T_STD_I32BE_TOKEN = 262,
-    H5T_STD_I32LE_TOKEN = 263,
-    H5T_STD_I64BE_TOKEN = 264,
-    H5T_STD_I64LE_TOKEN = 265,
-    H5T_STD_U8BE_TOKEN = 266,
-    H5T_STD_U8LE_TOKEN = 267,
-    H5T_STD_U16BE_TOKEN = 268,
-    H5T_STD_U16LE_TOKEN = 269,
-    H5T_STD_U32BE_TOKEN = 270,
-    H5T_STD_U32LE_TOKEN = 271,
-    H5T_STD_U64BE_TOKEN = 272,
-    H5T_STD_U64LE_TOKEN = 273,
-    H5T_NATIVE_CHAR_TOKEN = 274,
-    H5T_NATIVE_SCHAR_TOKEN = 275,
-    H5T_NATIVE_UCHAR_TOKEN = 276,
-    H5T_NATIVE_SHORT_TOKEN = 277,
-    H5T_NATIVE_USHORT_TOKEN = 278,
-    H5T_NATIVE_INT_TOKEN = 279,
-    H5T_NATIVE_UINT_TOKEN = 280,
-    H5T_NATIVE_LONG_TOKEN = 281,
-    H5T_NATIVE_ULONG_TOKEN = 282,
-    H5T_NATIVE_LLONG_TOKEN = 283,
-    H5T_NATIVE_ULLONG_TOKEN = 284,
-    H5T_IEEE_F32BE_TOKEN = 285,
-    H5T_IEEE_F32LE_TOKEN = 286,
-    H5T_IEEE_F64BE_TOKEN = 287,
-    H5T_IEEE_F64LE_TOKEN = 288,
-    H5T_NATIVE_FLOAT_TOKEN = 289,
-    H5T_NATIVE_DOUBLE_TOKEN = 290,
+#define YYTOKENTYPE
+enum yytokentype {
+    H5T_STD_I8BE_TOKEN       = 258,
+    H5T_STD_I8LE_TOKEN       = 259,
+    H5T_STD_I16BE_TOKEN      = 260,
+    H5T_STD_I16LE_TOKEN      = 261,
+    H5T_STD_I32BE_TOKEN      = 262,
+    H5T_STD_I32LE_TOKEN      = 263,
+    H5T_STD_I64BE_TOKEN      = 264,
+    H5T_STD_I64LE_TOKEN      = 265,
+    H5T_STD_U8BE_TOKEN       = 266,
+    H5T_STD_U8LE_TOKEN       = 267,
+    H5T_STD_U16BE_TOKEN      = 268,
+    H5T_STD_U16LE_TOKEN      = 269,
+    H5T_STD_U32BE_TOKEN      = 270,
+    H5T_STD_U32LE_TOKEN      = 271,
+    H5T_STD_U64BE_TOKEN      = 272,
+    H5T_STD_U64LE_TOKEN      = 273,
+    H5T_NATIVE_CHAR_TOKEN    = 274,
+    H5T_NATIVE_SCHAR_TOKEN   = 275,
+    H5T_NATIVE_UCHAR_TOKEN   = 276,
+    H5T_NATIVE_SHORT_TOKEN   = 277,
+    H5T_NATIVE_USHORT_TOKEN  = 278,
+    H5T_NATIVE_INT_TOKEN     = 279,
+    H5T_NATIVE_UINT_TOKEN    = 280,
+    H5T_NATIVE_LONG_TOKEN    = 281,
+    H5T_NATIVE_ULONG_TOKEN   = 282,
+    H5T_NATIVE_LLONG_TOKEN   = 283,
+    H5T_NATIVE_ULLONG_TOKEN  = 284,
+    H5T_IEEE_F32BE_TOKEN     = 285,
+    H5T_IEEE_F32LE_TOKEN     = 286,
+    H5T_IEEE_F64BE_TOKEN     = 287,
+    H5T_IEEE_F64LE_TOKEN     = 288,
+    H5T_NATIVE_FLOAT_TOKEN   = 289,
+    H5T_NATIVE_DOUBLE_TOKEN  = 290,
     H5T_NATIVE_LDOUBLE_TOKEN = 291,
-    H5T_STRING_TOKEN = 292,
-    STRSIZE_TOKEN = 293,
-    STRPAD_TOKEN = 294,
-    CSET_TOKEN = 295,
-    CTYPE_TOKEN = 296,
-    H5T_VARIABLE_TOKEN = 297,
-    H5T_STR_NULLTERM_TOKEN = 298,
-    H5T_STR_NULLPAD_TOKEN = 299,
-    H5T_STR_SPACEPAD_TOKEN = 300,
-    H5T_CSET_ASCII_TOKEN = 301,
-    H5T_CSET_UTF8_TOKEN = 302,
-    H5T_C_S1_TOKEN = 303,
-    H5T_FORTRAN_S1_TOKEN = 304,
-    H5T_OPAQUE_TOKEN = 305,
-    OPQ_SIZE_TOKEN = 306,
-    OPQ_TAG_TOKEN = 307,
-    H5T_COMPOUND_TOKEN = 308,
-    H5T_ENUM_TOKEN = 309,
-    H5T_ARRAY_TOKEN = 310,
-    H5T_VLEN_TOKEN = 311,
-    STRING = 312,
-    NUMBER = 313
-  };
+    H5T_STRING_TOKEN         = 292,
+    STRSIZE_TOKEN            = 293,
+    STRPAD_TOKEN             = 294,
+    CSET_TOKEN               = 295,
+    CTYPE_TOKEN              = 296,
+    H5T_VARIABLE_TOKEN       = 297,
+    H5T_STR_NULLTERM_TOKEN   = 298,
+    H5T_STR_NULLPAD_TOKEN    = 299,
+    H5T_STR_SPACEPAD_TOKEN   = 300,
+    H5T_CSET_ASCII_TOKEN     = 301,
+    H5T_CSET_UTF8_TOKEN      = 302,
+    H5T_C_S1_TOKEN           = 303,
+    H5T_FORTRAN_S1_TOKEN     = 304,
+    H5T_OPAQUE_TOKEN         = 305,
+    OPQ_SIZE_TOKEN           = 306,
+    OPQ_TAG_TOKEN            = 307,
+    H5T_COMPOUND_TOKEN       = 308,
+    H5T_ENUM_TOKEN           = 309,
+    H5T_ARRAY_TOKEN          = 310,
+    H5T_VLEN_TOKEN           = 311,
+    STRING                   = 312,
+    NUMBER                   = 313
+};
 #endif
 
 /* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
 
-union YYSTYPE
-{
+union YYSTYPE {
 #line 72 "hl/src/H5LTparse.y" /* yacc.c:1909  */
 
-    int     ival;         /*for integer token*/
-    char    *sval;        /*for name string*/
-    hid_t   hid;          /*for hid_t token*/
+    int   ival; /*for integer token*/
+    char *sval; /*for name string*/
+    hid_t hid;  /*for hid_t token*/
 
 #line 119 "hl/src/H5LTparse.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
+#define YYSTYPE_IS_TRIVIAL  1
+#define YYSTYPE_IS_DECLARED 1
 #endif
 
-
 extern YYSTYPE H5LTyylval;
 
-int H5LTyyparse (void);
+int H5LTyyparse(void);
 
 #endif /* !YY_H5LTYY_HL_SRC_H5LTPARSE_H_INCLUDED  */
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 6df7c4b..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
+#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 fa77ae1..7e18d33 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -16,22 +16,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);
@@ -69,109 +68,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
  *
@@ -194,98 +189,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;
@@ -315,87 +307,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;
@@ -436,33 +428,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -484,36 +475,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
@@ -539,30 +529,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -572,7 +560,6 @@ error:
  *-------------------------------------------------------------------------
  */
 
-
 /*-------------------------------------------------------------------------
  * Function: H5PTget_next
  *
@@ -593,30 +580,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -638,30 +624,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -692,40 +675,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -746,37 +725,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);
 }
 
 /*-------------------------------------------------------------------------
@@ -805,24 +787,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
  *
@@ -842,13 +824,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -871,25 +854,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -921,38 +905,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 */
 
 /*-------------------------------------------------------------------------
@@ -979,20 +962,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;
 }
 
 /*-------------------------------------------------------------------------
@@ -1013,18 +997,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 79d5cef..a3dfdae 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -1,191 +1,173 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-* 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 "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
-*             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
+ *             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);
@@ -193,283 +175,269 @@ 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
-*  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
+ *  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)
         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
-*
-* 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
+ *
+ * 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)
         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
-*
-* 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
+ *
+ * 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;
 
@@ -480,70 +448,70 @@ herr_t H5TBwrite_fields_name(hid_t loc_id,
         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 */
@@ -553,156 +521,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
-*
-* 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
+ *
+ * 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)
         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;
 
@@ -711,250 +673,236 @@ 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
-*
-* 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
+ *
+ * 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)
         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
-*
-* 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
+ *
+ * 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)
         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
-*
-* 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
+ *
+ * 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)
         goto out;
@@ -962,58 +910,58 @@ herr_t H5TBread_fields_name(hid_t loc_id,
         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++;
@@ -1024,159 +972,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
-*
-* 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
+ *
+ * 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)
         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;
 
@@ -1185,683 +1127,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
-*
-* 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
+ *
+ * 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)
         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
-*
-* 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
+ *
+ * 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)
         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
-*
-* 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
+ *
+ * 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;
+        goto out;
     if (dset_name2 == NULL)
-      goto out;
+        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
-*
-* 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
+ *
+ * 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;
+        goto out;
     if (dset_name2 == NULL)
-      goto out;
+        goto out;
     if (dset_name3 == NULL)
-      goto out;
+        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 */
@@ -1869,249 +1799,245 @@ 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
-*
-* 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
+ *
+ * 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)
@@ -2120,7 +2046,7 @@ herr_t H5TBinsert_field(hid_t loc_id,
         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;
 
     /*-------------------------------------------------------------------------
@@ -2129,27 +2055,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;
 
     /*-------------------------------------------------------------------------
@@ -2158,15 +2084,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;
 
     /*-------------------------------------------------------------------------
@@ -2175,31 +2101,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;
@@ -2208,19 +2134,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;
@@ -2229,11 +2155,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
@@ -2241,21 +2167,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;
 
     /*-------------------------------------------------------------------------
@@ -2263,21 +2189,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;
 
     /*-------------------------------------------------------------------------
@@ -2286,7 +2212,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;
 
     /*-------------------------------------------------------------------------
@@ -2295,27 +2221,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 */
 
@@ -2323,14 +2249,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;
 
     /*-------------------------------------------------------------------------
@@ -2339,33 +2265,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 */
@@ -2373,18 +2299,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 */
@@ -2393,24 +2319,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 */
@@ -2418,115 +2344,113 @@ 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
-*
-* 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
+ *
+ * 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)
@@ -2535,61 +2459,61 @@ herr_t H5TBdelete_field(hid_t loc_id,
         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;
 
@@ -2604,75 +2528,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 */
@@ -2682,96 +2606,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;
 
@@ -2785,51 +2709,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 */
@@ -2837,24 +2761,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 */
@@ -2862,232 +2786,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
-*
-* 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
+ *
+ * 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
-*
-* 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
+ *
+ * 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)
         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
-*
-* 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
+ *
+ * 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)
         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;
 
@@ -3097,106 +3016,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
-*
-* 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
+ *
+ * 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)
         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 */
@@ -3204,122 +3120,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
-*
-* 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
+ *
+ * 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;
+        return FALSE;
     if (field_list == NULL)
-      return FALSE;
+        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
-*
-* 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
+ *
+ * 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);
@@ -3329,57 +3242,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
-*
-* 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
+ *
+ * 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 */
@@ -3387,22 +3296,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 */
@@ -3410,159 +3319,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
-*             James Laird
-*
-* 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
+ *             James Laird
+ *
+ * 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
-*             James Laird
-*
-* 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
+ *             James Laird
+ *
+ * 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*/
-