Source formatted

1 files changed, 554 insertions, 577 deletions

diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 190eeb6..24baa42 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -11,7 +11,7 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5private.h"    /* Generic Functions      */
+#include "H5private.h" /* Generic Functions      */
 #include "h5tools.h"
 #include "h5tools_utils.h"
 #include "h5tools_ref.h"
@@ -24,79 +24,78 @@
 /* Parameters to control statistics gathered */
 
 /* Default threshold for small groups/datasets/attributes */
-#define DEF_SIZE_SMALL_GROUPS           10
-#define DEF_SIZE_SMALL_DSETS            10
-#define DEF_SIZE_SMALL_ATTRS            10
-
-#define  H5_NFILTERS_IMPL        8     /* Number of currently implemented filters + one to
-                                          accommodate for user-define filters + one
-                                          to accomodate datasets whithout any filters */
+#define DEF_SIZE_SMALL_GROUPS 10
+#define DEF_SIZE_SMALL_DSETS  10
+#define DEF_SIZE_SMALL_ATTRS  10
 
+#define H5_NFILTERS_IMPL                                                                                     \
+    8 /* Number of currently implemented filters + one to                                                    \
+         accommodate for user-define filters + one                                                           \
+         to accomodate datasets whithout any filters */
 
 /* Datatype statistics for datasets */
 typedef struct dtype_info_t {
-    hid_t tid;                          /* ID of datatype */
-    unsigned long count;                /* Number of types found */
-    unsigned long named;                /* Number of types that are named */
+    hid_t         tid;   /* ID of datatype */
+    unsigned long count; /* Number of types found */
+    unsigned long named; /* Number of types that are named */
 } dtype_info_t;
 
 typedef struct ohdr_info_t {
-    hsize_t total_size;                 /* Total size of object headers */
-    hsize_t free_size;                  /* Total free space in object headers */
+    hsize_t total_size; /* Total size of object headers */
+    hsize_t free_size;  /* Total free space in object headers */
 } ohdr_info_t;
 
 /* Info to pass to the iteration functions */
 typedef struct iter_t {
-    hid_t fid;                          /* File ID */
-    hsize_t filesize;      /* Size of the file */
-    unsigned long uniq_groups;          /* Number of unique groups */
-    unsigned long uniq_dsets;           /* Number of unique datasets */
-    unsigned long uniq_dtypes;          /* Number of unique named datatypes */
-    unsigned long uniq_links;           /* Number of unique links */
-    unsigned long uniq_others;          /* Number of other unique objects */
-
-    unsigned long max_links;            /* Maximum # of links to an object */
-    hsize_t max_fanout;                 /* Maximum fanout from a group */
-    unsigned long *num_small_groups;    /* Size of small groups tracked */
-    unsigned group_nbins;               /* Number of bins for group counts */
-    unsigned long *group_bins;          /* Pointer to array of bins for group counts */
-    ohdr_info_t group_ohdr_info;        /* Object header information for groups */
-
-    hsize_t  max_attrs;                 /* Maximum attributes from a group */
-    unsigned long *num_small_attrs;     /* Size of small attributes tracked */
-    unsigned attr_nbins;                /* Number of bins for attribute counts */
-    unsigned long *attr_bins;           /* Pointer to array of bins for attribute counts */
-
-    unsigned max_dset_rank;             /* Maximum rank of dataset */
-    unsigned long dset_rank_count[H5S_MAX_RANK];   /* Number of datasets of each rank */
-    hsize_t max_dset_dims;              /* Maximum dimension size of dataset */
-    unsigned long *small_dset_dims;     /* Size of dimensions of small datasets tracked */
-    unsigned long dset_layouts[H5D_NLAYOUTS];           /* Type of storage for each dataset */
-    unsigned long dset_comptype[H5_NFILTERS_IMPL];     /* Number of currently implemented filters */
-    unsigned long dset_ntypes;          /* Number of diff. dataset datatypes found */
-    dtype_info_t *dset_type_info;       /* Pointer to dataset datatype information found */
-    unsigned dset_dim_nbins;            /* Number of bins for dataset dimensions */
-    unsigned long *dset_dim_bins;       /* Pointer to array of bins for dataset dimensions */
-    ohdr_info_t dset_ohdr_info;         /* Object header information for datasets */
-    hsize_t dset_storage_size;          /* Size of raw data for datasets */
-    hsize_t dset_external_storage_size; /* Size of raw data for datasets with external storage */
-    ohdr_info_t dtype_ohdr_info;        /* Object header information for datatypes */
-    hsize_t groups_btree_storage_size;  /* btree size for group */
-    hsize_t groups_heap_storage_size;   /* heap size for group */
-    hsize_t attrs_btree_storage_size;   /* btree size for attributes (1.8) */
-    hsize_t attrs_heap_storage_size;    /* fractal heap size for attributes (1.8) */
-    hsize_t SM_hdr_storage_size;        /* header size for SOHM table (1.8) */
-    hsize_t SM_index_storage_size;      /* index (btree & list) size for SOHM table (1.8) */
-    hsize_t SM_heap_storage_size;       /* fractal heap size for SOHM table (1.8) */
-    hsize_t super_ext_size;             /* superblock extension size */
-    hsize_t ublk_size;                  /* user block size (if exists) */
-    hsize_t datasets_index_storage_size;/* meta size for chunked dataset's indexing type */
-    hsize_t datasets_heap_storage_size; /* heap size for dataset with external storage */
-    unsigned long nexternal;            /* Number of external files for a dataset */
-    int           local;                /* Flag to indicate iteration over the object*/
+    hid_t         fid;         /* File ID */
+    hsize_t       filesize;    /* Size of the file */
+    unsigned long uniq_groups; /* Number of unique groups */
+    unsigned long uniq_dsets;  /* Number of unique datasets */
+    unsigned long uniq_dtypes; /* Number of unique named datatypes */
+    unsigned long uniq_links;  /* Number of unique links */
+    unsigned long uniq_others; /* Number of other unique objects */
+
+    unsigned long  max_links;        /* Maximum # of links to an object */
+    hsize_t        max_fanout;       /* Maximum fanout from a group */
+    unsigned long *num_small_groups; /* Size of small groups tracked */
+    unsigned       group_nbins;      /* Number of bins for group counts */
+    unsigned long *group_bins;       /* Pointer to array of bins for group counts */
+    ohdr_info_t    group_ohdr_info;  /* Object header information for groups */
+
+    hsize_t        max_attrs;       /* Maximum attributes from a group */
+    unsigned long *num_small_attrs; /* Size of small attributes tracked */
+    unsigned       attr_nbins;      /* Number of bins for attribute counts */
+    unsigned long *attr_bins;       /* Pointer to array of bins for attribute counts */
+
+    unsigned       max_dset_rank;                   /* Maximum rank of dataset */
+    unsigned long  dset_rank_count[H5S_MAX_RANK];   /* Number of datasets of each rank */
+    hsize_t        max_dset_dims;                   /* Maximum dimension size of dataset */
+    unsigned long *small_dset_dims;                 /* Size of dimensions of small datasets tracked */
+    unsigned long  dset_layouts[H5D_NLAYOUTS];      /* Type of storage for each dataset */
+    unsigned long  dset_comptype[H5_NFILTERS_IMPL]; /* Number of currently implemented filters */
+    unsigned long  dset_ntypes;                     /* Number of diff. dataset datatypes found */
+    dtype_info_t * dset_type_info;                  /* Pointer to dataset datatype information found */
+    unsigned       dset_dim_nbins;                  /* Number of bins for dataset dimensions */
+    unsigned long *dset_dim_bins;                   /* Pointer to array of bins for dataset dimensions */
+    ohdr_info_t    dset_ohdr_info;                  /* Object header information for datasets */
+    hsize_t        dset_storage_size;               /* Size of raw data for datasets */
+    hsize_t        dset_external_storage_size;      /* Size of raw data for datasets with external storage */
+    ohdr_info_t    dtype_ohdr_info;                 /* Object header information for datatypes */
+    hsize_t        groups_btree_storage_size;       /* btree size for group */
+    hsize_t        groups_heap_storage_size;        /* heap size for group */
+    hsize_t        attrs_btree_storage_size;        /* btree size for attributes (1.8) */
+    hsize_t        attrs_heap_storage_size;         /* fractal heap size for attributes (1.8) */
+    hsize_t        SM_hdr_storage_size;             /* header size for SOHM table (1.8) */
+    hsize_t        SM_index_storage_size;           /* index (btree & list) size for SOHM table (1.8) */
+    hsize_t        SM_heap_storage_size;            /* fractal heap size for SOHM table (1.8) */
+    hsize_t        super_ext_size;                  /* superblock extension size */
+    hsize_t        ublk_size;                       /* user block size (if exists) */
+    hsize_t        datasets_index_storage_size;     /* meta size for chunked dataset's indexing type */
+    hsize_t        datasets_heap_storage_size;      /* heap size for dataset with external storage */
+    unsigned long  nexternal;                       /* Number of external files for a dataset */
+    int            local;                           /* Flag to indicate iteration over the object*/
 } iter_t;
 
-
 static const char *drivername = "";
 
 #ifdef H5_HAVE_ROS3_VFD
@@ -124,26 +123,26 @@ static H5FD_hdfs_fapl_t hdfs_fa = {
 };
 #endif /* H5_HAVE_LIBHDFS */
 
-static int        display_all = TRUE;
+static int display_all = TRUE;
 
 /* Enable the printing of selected statistics */
-static int        display_file = FALSE;     /* display file information */
-static int        display_group = FALSE;    /* display groups information */
-static int        display_dset = FALSE;     /* display datasets information */
-static int        display_dset_dtype_meta = FALSE;  /* display datasets' datatype information */
-static int        display_attr = FALSE;     /* display attributes information */
-static int        display_summary = FALSE;  /* display summary of file space information */
+static int display_file            = FALSE; /* display file information */
+static int display_group           = FALSE; /* display groups information */
+static int display_dset            = FALSE; /* display datasets information */
+static int display_dset_dtype_meta = FALSE; /* display datasets' datatype information */
+static int display_attr            = FALSE; /* display attributes information */
+static int display_summary         = FALSE; /* display summary of file space information */
 
-static int        display_file_metadata = FALSE;    /* display file space info for file's metadata */
-static int        display_group_metadata = FALSE;   /* display file space info for groups' metadata */
-static int        display_dset_metadata = FALSE;    /* display file space info for datasets' metadata */
+static int display_file_metadata  = FALSE; /* display file space info for file's metadata */
+static int display_group_metadata = FALSE; /* display file space info for groups' metadata */
+static int display_dset_metadata  = FALSE; /* display file space info for datasets' metadata */
 
-static int        display_object = FALSE;  /* not implemented yet */
+static int display_object = FALSE; /* not implemented yet */
 
 /* Initialize threshold for small groups/datasets/attributes */
-static int      sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
-static int      sdsets_threshold = DEF_SIZE_SMALL_DSETS;
-static int      sattrs_threshold = DEF_SIZE_SMALL_ATTRS;
+static int sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
+static int sdsets_threshold  = DEF_SIZE_SMALL_DSETS;
+static int sattrs_threshold  = DEF_SIZE_SMALL_ATTRS;
 
 /* a structure for handling the order command-line parameters come in */
 struct handler_t {
@@ -151,112 +150,108 @@ struct handler_t {
     char **obj;
 };
 
-static const char *s_opts ="Aa:Ddm:EFfhGgl:STO:Vw:H:";
+static const char *s_opts = "Aa:Ddm:EFfhGgl:STO:Vw:H:";
 /* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
-static struct long_options l_opts[] = {
-    {"help", no_arg, 'h'},
-    {"hel", no_arg, 'h'},
-    {"he", no_arg, 'h'},
-    {"filemetadata", no_arg, 'F'},
-    {"filemetadat", no_arg, 'F'},
-    {"filemetada", no_arg, 'F'},
-    {"filemetad", no_arg, 'F'},
-    {"filemeta", no_arg, 'F'},
-    {"filemet", no_arg, 'F'},
-    {"fileme", no_arg, 'F'},
-    {"filem", no_arg, 'F'},
-    {"file", no_arg, 'f'},
-    {"fil", no_arg, 'f'},
-    {"fi", no_arg, 'f'},
-    {"groupmetadata", no_arg, 'G'},
-    {"groupmetadat", no_arg, 'G'},
-    {"groupmetada", no_arg, 'G'},
-    {"groupmetad", no_arg, 'G'},
-    {"groupmeta", no_arg, 'G'},
-    {"groupmet", no_arg, 'G'},
-    {"groupme", no_arg, 'G'},
-    {"groupm", no_arg, 'G'},
-    {"group", no_arg, 'g'},
-    {"grou", no_arg, 'g'},
-    {"gro", no_arg, 'g'},
-    {"gr", no_arg, 'g'},
-    { "links", require_arg, 'l' },
-    { "link", require_arg, 'l' },
-    { "lin", require_arg, 'l' },
-    { "li", require_arg, 'l' },
-    {"dsetmetadata", no_arg, 'D'},
-    {"dsetmetadat", no_arg, 'D'},
-    {"dsetmetada", no_arg, 'D'},
-    {"dsetmetad", no_arg, 'D'},
-    {"dsetmeta", no_arg, 'D'},
-    {"dsetmet", no_arg, 'D'},
-    {"dsetme", no_arg, 'D'},
-    {"dsetm", no_arg, 'D'},
-    {"dset", no_arg, 'd'},
-    {"dse", no_arg, 'd'},
-    {"ds", no_arg, 'd'},
-    {"dims", require_arg, 'm'},
-    {"dim", require_arg, 'm'},
-    {"di", require_arg, 'm'},
-    {"dtypemetadata", no_arg, 'T'},
-    {"dtypemetadat", no_arg, 'T'},
-    {"dtypemetada", no_arg, 'T'},
-    {"dtypemetad", no_arg, 'T'},
-    {"dtypemeta", no_arg, 'T'},
-    {"dtypemet", no_arg, 'T'},
-    {"dtypeme", no_arg, 'T'},
-    {"dtypem", no_arg, 'T'},
-    {"dtype", no_arg, 'T'},
-    {"dtyp", no_arg, 'T'},
-    {"dty", no_arg, 'T'},
-    {"dt", no_arg, 'T'},
-    { "object", require_arg, 'O' },
-    { "objec", require_arg, 'O' },
-    { "obje", require_arg, 'O' },
-    { "obj", require_arg, 'O' },
-    { "ob", require_arg, 'O' },
-    { "version", no_arg, 'V' },
-    { "versio", no_arg, 'V' },
-    { "versi", no_arg, 'V' },
-    { "vers", no_arg, 'V' },
-    { "ver", no_arg, 'V' },
-    { "ve", no_arg, 'V' },
-    { "attribute", no_arg, 'A' },
-    { "attribut", no_arg, 'A' },
-    { "attribu", no_arg, 'A' },
-    { "attrib", no_arg, 'A' },
-    { "attri", no_arg, 'A' },
-    { "attr", no_arg, 'A' },
-    { "att", no_arg, 'A' },
-    { "at", no_arg, 'A' },
-    { "enable-error-stack", no_arg, 'E' },
-    { "numattrs", require_arg, 'a' },
-    { "numattr", require_arg, 'a' },
-    { "numatt", require_arg, 'a' },
-    { "numat", require_arg, 'a' },
-    { "numa", require_arg, 'a' },
-    { "num", require_arg, 'a' },
-    { "nu", require_arg, 'a' },
-    { "summary", no_arg, 'S' },
-    { "summar", no_arg, 'S' },
-    { "summa", no_arg, 'S' },
-    { "summ", no_arg, 'S' },
-    { "sum", no_arg, 'S' },
-    { "su", no_arg, 'S' },
-    { "s3-cred", require_arg, 'w' },
-    { "hdfs-attrs", require_arg, 'H' },
-    { NULL, 0, '\0' }
-};
+static struct long_options l_opts[] = {{"help", no_arg, 'h'},
+                                       {"hel", no_arg, 'h'},
+                                       {"he", no_arg, 'h'},
+                                       {"filemetadata", no_arg, 'F'},
+                                       {"filemetadat", no_arg, 'F'},
+                                       {"filemetada", no_arg, 'F'},
+                                       {"filemetad", no_arg, 'F'},
+                                       {"filemeta", no_arg, 'F'},
+                                       {"filemet", no_arg, 'F'},
+                                       {"fileme", no_arg, 'F'},
+                                       {"filem", no_arg, 'F'},
+                                       {"file", no_arg, 'f'},
+                                       {"fil", no_arg, 'f'},
+                                       {"fi", no_arg, 'f'},
+                                       {"groupmetadata", no_arg, 'G'},
+                                       {"groupmetadat", no_arg, 'G'},
+                                       {"groupmetada", no_arg, 'G'},
+                                       {"groupmetad", no_arg, 'G'},
+                                       {"groupmeta", no_arg, 'G'},
+                                       {"groupmet", no_arg, 'G'},
+                                       {"groupme", no_arg, 'G'},
+                                       {"groupm", no_arg, 'G'},
+                                       {"group", no_arg, 'g'},
+                                       {"grou", no_arg, 'g'},
+                                       {"gro", no_arg, 'g'},
+                                       {"gr", no_arg, 'g'},
+                                       {"links", require_arg, 'l'},
+                                       {"link", require_arg, 'l'},
+                                       {"lin", require_arg, 'l'},
+                                       {"li", require_arg, 'l'},
+                                       {"dsetmetadata", no_arg, 'D'},
+                                       {"dsetmetadat", no_arg, 'D'},
+                                       {"dsetmetada", no_arg, 'D'},
+                                       {"dsetmetad", no_arg, 'D'},
+                                       {"dsetmeta", no_arg, 'D'},
+                                       {"dsetmet", no_arg, 'D'},
+                                       {"dsetme", no_arg, 'D'},
+                                       {"dsetm", no_arg, 'D'},
+                                       {"dset", no_arg, 'd'},
+                                       {"dse", no_arg, 'd'},
+                                       {"ds", no_arg, 'd'},
+                                       {"dims", require_arg, 'm'},
+                                       {"dim", require_arg, 'm'},
+                                       {"di", require_arg, 'm'},
+                                       {"dtypemetadata", no_arg, 'T'},
+                                       {"dtypemetadat", no_arg, 'T'},
+                                       {"dtypemetada", no_arg, 'T'},
+                                       {"dtypemetad", no_arg, 'T'},
+                                       {"dtypemeta", no_arg, 'T'},
+                                       {"dtypemet", no_arg, 'T'},
+                                       {"dtypeme", no_arg, 'T'},
+                                       {"dtypem", no_arg, 'T'},
+                                       {"dtype", no_arg, 'T'},
+                                       {"dtyp", no_arg, 'T'},
+                                       {"dty", no_arg, 'T'},
+                                       {"dt", no_arg, 'T'},
+                                       {"object", require_arg, 'O'},
+                                       {"objec", require_arg, 'O'},
+                                       {"obje", require_arg, 'O'},
+                                       {"obj", require_arg, 'O'},
+                                       {"ob", require_arg, 'O'},
+                                       {"version", no_arg, 'V'},
+                                       {"versio", no_arg, 'V'},
+                                       {"versi", no_arg, 'V'},
+                                       {"vers", no_arg, 'V'},
+                                       {"ver", no_arg, 'V'},
+                                       {"ve", no_arg, 'V'},
+                                       {"attribute", no_arg, 'A'},
+                                       {"attribut", no_arg, 'A'},
+                                       {"attribu", no_arg, 'A'},
+                                       {"attrib", no_arg, 'A'},
+                                       {"attri", no_arg, 'A'},
+                                       {"attr", no_arg, 'A'},
+                                       {"att", no_arg, 'A'},
+                                       {"at", no_arg, 'A'},
+                                       {"enable-error-stack", no_arg, 'E'},
+                                       {"numattrs", require_arg, 'a'},
+                                       {"numattr", require_arg, 'a'},
+                                       {"numatt", require_arg, 'a'},
+                                       {"numat", require_arg, 'a'},
+                                       {"numa", require_arg, 'a'},
+                                       {"num", require_arg, 'a'},
+                                       {"nu", require_arg, 'a'},
+                                       {"summary", no_arg, 'S'},
+                                       {"summar", no_arg, 'S'},
+                                       {"summa", no_arg, 'S'},
+                                       {"summ", no_arg, 'S'},
+                                       {"sum", no_arg, 'S'},
+                                       {"su", no_arg, 'S'},
+                                       {"s3-cred", require_arg, 'w'},
+                                       {"hdfs-attrs", require_arg, 'H'},
+                                       {NULL, 0, '\0'}};
 
 static void
 leave(int ret)
 {
-   h5tools_close();
-   HDexit(ret);
+    h5tools_close();
+    HDexit(ret);
 }
 
-
-
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -266,46 +261,48 @@ leave(int ret)
  *
  *-------------------------------------------------------------------------
  */
-static void usage(const char *prog)
+static void
+usage(const char *prog)
 {
-     HDfflush(stdout);
-     HDfprintf(stdout, "Usage: %s [OPTIONS] file\n", prog);
-     HDfprintf(stdout, "\n");
-     HDfprintf(stdout, "      OPTIONS\n");
-     HDfprintf(stdout, "     -h, --help            Print a usage message and exit\n");
-     HDfprintf(stdout, "     -V, --version         Print version number and exit\n");
-     HDfprintf(stdout, "     -f, --file            Print file information\n");
-     HDfprintf(stdout, "     -F, --filemetadata    Print file space information for file's metadata\n");
-     HDfprintf(stdout, "     -g, --group           Print group information\n");
-     HDfprintf(stdout, "     -l N, --links=N       Set the threshold for the # of links when printing\n");
-     HDfprintf(stdout, "                           information for small groups.  N is an integer greater\n");
-     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-     HDfprintf(stdout, "     -G, --groupmetadata   Print file space information for groups' metadata\n");
-     HDfprintf(stdout, "     -d, --dset            Print dataset information\n");
-     HDfprintf(stdout, "     -m N, --dims=N        Set the threshold for the dimension sizes when printing\n");
-     HDfprintf(stdout, "                           information for small datasets.  N is an integer greater\n");
-     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-     HDfprintf(stdout, "     -D, --dsetmetadata    Print file space information for datasets' metadata\n");
-     HDfprintf(stdout, "     -T, --dtypemetadata   Print datasets' datatype information\n");
-     HDfprintf(stdout, "     -A, --attribute       Print attribute information\n");
-     HDfprintf(stdout, "     -a N, --numattrs=N    Set the threshold for the # of attributes when printing\n");
-     HDfprintf(stdout, "                           information for small # of attributes.  N is an integer greater\n");
-     HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
-     HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
-     HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
-     HDfprintf(stdout, "     --s3-cred=<cred>      Access file on S3, using provided credential\n");
-     HDfprintf(stdout, "                           <cred> :: (region,id,key)\n");
-     HDfprintf(stdout, "                           If <cred> == \"(,,)\", no authentication is used.\n");
-     HDfprintf(stdout, "     --hdfs-attrs=<attrs>  Access a file on HDFS with given configuration\n");
-     HDfprintf(stdout, "                           attributes.\n");
-     HDfprintf(stdout, "                           <attrs> :: (<namenode name>,<namenode port>,\n");
-     HDfprintf(stdout, "                                       <kerberos cache path>,<username>,\n");
-     HDfprintf(stdout, "                                       <buffer size>)\n");
-     HDfprintf(stdout, "                           If an attribute is empty, a default value will be\n");
-     HDfprintf(stdout, "                           used.\n");
+    HDfflush(stdout);
+    HDfprintf(stdout, "Usage: %s [OPTIONS] file\n", prog);
+    HDfprintf(stdout, "\n");
+    HDfprintf(stdout, "      OPTIONS\n");
+    HDfprintf(stdout, "     -h, --help            Print a usage message and exit\n");
+    HDfprintf(stdout, "     -V, --version         Print version number and exit\n");
+    HDfprintf(stdout, "     -f, --file            Print file information\n");
+    HDfprintf(stdout, "     -F, --filemetadata    Print file space information for file's metadata\n");
+    HDfprintf(stdout, "     -g, --group           Print group information\n");
+    HDfprintf(stdout, "     -l N, --links=N       Set the threshold for the # of links when printing\n");
+    HDfprintf(stdout, "                           information for small groups.  N is an integer greater\n");
+    HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
+    HDfprintf(stdout, "     -G, --groupmetadata   Print file space information for groups' metadata\n");
+    HDfprintf(stdout, "     -d, --dset            Print dataset information\n");
+    HDfprintf(stdout, "     -m N, --dims=N        Set the threshold for the dimension sizes when printing\n");
+    HDfprintf(stdout,
+              "                           information for small datasets.  N is an integer greater\n");
+    HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
+    HDfprintf(stdout, "     -D, --dsetmetadata    Print file space information for datasets' metadata\n");
+    HDfprintf(stdout, "     -T, --dtypemetadata   Print datasets' datatype information\n");
+    HDfprintf(stdout, "     -A, --attribute       Print attribute information\n");
+    HDfprintf(stdout, "     -a N, --numattrs=N    Set the threshold for the # of attributes when printing\n");
+    HDfprintf(stdout,
+              "                           information for small # of attributes.  N is an integer greater\n");
+    HDfprintf(stdout, "                           than 0.  The default threshold is 10.\n");
+    HDfprintf(stdout, "     -S, --summary         Print summary of file space information\n");
+    HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
+    HDfprintf(stdout, "     --s3-cred=<cred>      Access file on S3, using provided credential\n");
+    HDfprintf(stdout, "                           <cred> :: (region,id,key)\n");
+    HDfprintf(stdout, "                           If <cred> == \"(,,)\", no authentication is used.\n");
+    HDfprintf(stdout, "     --hdfs-attrs=<attrs>  Access a file on HDFS with given configuration\n");
+    HDfprintf(stdout, "                           attributes.\n");
+    HDfprintf(stdout, "                           <attrs> :: (<namenode name>,<namenode port>,\n");
+    HDfprintf(stdout, "                                       <kerberos cache path>,<username>,\n");
+    HDfprintf(stdout, "                                       <buffer size>)\n");
+    HDfprintf(stdout, "                           If an attribute is empty, a default value will be\n");
+    HDfprintf(stdout, "                           used.\n");
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: ceil_log10
  *
@@ -322,9 +319,9 @@ static unsigned
 ceil_log10(unsigned long x)
 {
     unsigned long pow10 = 1;
-    unsigned ret = 0;
+    unsigned      ret   = 0;
 
-    while(x >= pow10) {
+    while (x >= pow10) {
         pow10 *= 10;
         ret++;
     } /* end while */
@@ -332,7 +329,6 @@ ceil_log10(unsigned long x)
     return ret;
 } /* ceil_log10() */
 
-
 /*-------------------------------------------------------------------------
  * Function: attribute_stats
  *
@@ -350,39 +346,38 @@ ceil_log10(unsigned long x)
 static herr_t
 attribute_stats(iter_t *iter, const H5O_info_t *oi)
 {
-    unsigned     bin;               /* "bin" the number of objects falls in */
+    unsigned bin; /* "bin" the number of objects falls in */
 
     /* Update dataset & attribute metadata info */
     iter->attrs_btree_storage_size += oi->meta_size.attr.index_size;
     iter->attrs_heap_storage_size += oi->meta_size.attr.heap_size;
 
     /* Update small # of attribute count & limits */
-    if(oi->num_attrs <= (hsize_t)sattrs_threshold)
+    if (oi->num_attrs <= (hsize_t)sattrs_threshold)
         (iter->num_small_attrs[(size_t)oi->num_attrs])++;
-    if(oi->num_attrs > iter->max_attrs)
+    if (oi->num_attrs > iter->max_attrs)
         iter->max_attrs = oi->num_attrs;
 
     /* Add attribute count to proper bin */
     bin = ceil_log10((unsigned long)oi->num_attrs);
-    if((bin + 1) > iter->attr_nbins) {
+    if ((bin + 1) > iter->attr_nbins) {
         iter->attr_bins = (unsigned long *)HDrealloc(iter->attr_bins, (bin + 1) * sizeof(unsigned long));
         HDassert(iter->attr_bins);
 
         /* Initialize counts for intermediate bins */
-        while(iter->attr_nbins < bin)
+        while (iter->attr_nbins < bin)
             iter->attr_bins[iter->attr_nbins++] = 0;
         iter->attr_nbins++;
 
         /* Initialize count for new bin */
         iter->attr_bins[bin] = 1;
-     } /* end if */
-     else
-         (iter->attr_bins[bin])++;
+    } /* end if */
+    else
+        (iter->attr_bins[bin])++;
 
-     return 0;
+    return 0;
 } /* end attribute_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function: group_stats
  *
@@ -411,9 +406,9 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
 static herr_t
 group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 {
-    H5G_info_t ginfo;           /* Group information */
-    unsigned bin;               /* "bin" the number of objects falls in */
-    herr_t ret_value = SUCCEED;
+    H5G_info_t ginfo; /* Group information */
+    unsigned   bin;   /* "bin" the number of objects falls in */
+    herr_t     ret_value = SUCCEED;
 
     /* Gather statistics about this type of object */
     iter->uniq_groups++;
@@ -423,26 +418,27 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->group_ohdr_info.free_size += oi->hdr.space.free;
 
     /* Get group information */
-    if((ret_value = H5Gget_info_by_name(iter->fid, name, &ginfo, H5P_DEFAULT)) < 0)
+    if ((ret_value = H5Gget_info_by_name(iter->fid, name, &ginfo, H5P_DEFAULT)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Gget_info_by_name() failed");
 
     /* Update link stats */
     /* Collect statistics for small groups */
-    if(ginfo.nlinks < (hsize_t)sgroups_threshold)
+    if (ginfo.nlinks < (hsize_t)sgroups_threshold)
         (iter->num_small_groups[(size_t)ginfo.nlinks])++;
     /* Determine maximum link count */
-    if(ginfo.nlinks > iter->max_fanout)
+    if (ginfo.nlinks > iter->max_fanout)
         iter->max_fanout = ginfo.nlinks;
 
     /* Add group count to proper bin */
     bin = ceil_log10((unsigned long)ginfo.nlinks);
-    if((bin + 1) > iter->group_nbins) {
+    if ((bin + 1) > iter->group_nbins) {
         /* Allocate more storage for info about dataset's datatype */
-        if((iter->group_bins = (unsigned long *)HDrealloc(iter->group_bins, (bin + 1) * sizeof(unsigned long))) == NULL)
+        if ((iter->group_bins =
+                 (unsigned long *)HDrealloc(iter->group_bins, (bin + 1) * sizeof(unsigned long))) == NULL)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Drealloc() failed");
 
         /* Initialize counts for intermediate bins */
-        while(iter->group_nbins < bin)
+        while (iter->group_nbins < bin)
             iter->group_bins[iter->group_nbins++] = 0;
         iter->group_nbins++;
 
@@ -457,14 +453,13 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->groups_heap_storage_size += oi->meta_size.obj.heap_size;
 
     /* Update attribute metadata info */
-    if((ret_value = attribute_stats(iter, oi)) < 0)
+    if ((ret_value = attribute_stats(iter, oi)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "attribute_stats failed");
 
 done:
     return ret_value;
 } /* end group_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function: dataset_stats
  *
@@ -481,22 +476,22 @@ done:
 static herr_t
 dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 {
-    unsigned bin;               /* "bin" the number of objects falls in */
-    hid_t did;                  /* Dataset ID */
-    hid_t sid;                  /* Dataspace ID */
-    hid_t tid;                  /* Datatype ID */
-    hid_t dcpl;                 /* Dataset creation property list ID */
-    hsize_t dims[H5S_MAX_RANK]; /* Dimensions of dataset */
-    H5D_layout_t lout;          /* Layout of dataset */
-    unsigned type_found;        /* Whether the dataset's datatype was */
-                                /* already found */
-    int ndims;                  /* Number of dimensions of dataset */
-    hsize_t storage;            /* Size of dataset storage */
-    unsigned u;                 /* Local index variable */
-    int num_ext;                /* Number of external files for a dataset */
-    int nfltr;                  /* Number of filters for a dataset */
-    H5Z_filter_t fltr;          /* Filter identifier */
-    herr_t ret_value = SUCCEED;
+    unsigned     bin;                /* "bin" the number of objects falls in */
+    hid_t        did;                /* Dataset ID */
+    hid_t        sid;                /* Dataspace ID */
+    hid_t        tid;                /* Datatype ID */
+    hid_t        dcpl;               /* Dataset creation property list ID */
+    hsize_t      dims[H5S_MAX_RANK]; /* Dimensions of dataset */
+    H5D_layout_t lout;               /* Layout of dataset */
+    unsigned     type_found;         /* Whether the dataset's datatype was */
+                                     /* already found */
+    int          ndims;              /* Number of dimensions of dataset */
+    hsize_t      storage;            /* Size of dataset storage */
+    unsigned     u;                  /* Local index variable */
+    int          num_ext;            /* Number of external files for a dataset */
+    int          nfltr;              /* Number of filters for a dataset */
+    H5Z_filter_t fltr;               /* Filter identifier */
+    herr_t       ret_value = SUCCEED;
 
     /* Gather statistics about this type of object */
     iter->uniq_dsets++;
@@ -505,7 +500,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->dset_ohdr_info.total_size += oi->hdr.space.total;
     iter->dset_ohdr_info.free_size += oi->hdr.space.free;
 
-    if((did = H5Dopen2(iter->fid, name, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(iter->fid, name, H5P_DEFAULT)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Dopen() failed");
 
     /* Update dataset metadata info */
@@ -513,7 +508,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     iter->datasets_heap_storage_size += oi->meta_size.obj.heap_size;
 
     /* Update attribute metadata info */
-    if((ret_value = attribute_stats(iter, oi)) < 0)
+    if ((ret_value = attribute_stats(iter, oi)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "attribute_stats() failed");
 
     /* Get storage info */
@@ -521,26 +516,26 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     storage = H5Dget_storage_size(did);
 
     /* Gather layout statistics */
-    if((dcpl = H5Dget_create_plist(did)) < 0)
+    if ((dcpl = H5Dget_create_plist(did)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Dget_create_plist() failed");
 
-    if((lout = H5Pget_layout(dcpl)) < 0)
+    if ((lout = H5Pget_layout(dcpl)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Pget_layout() failed");
 
     /* Object header's total size for H5D_COMPACT layout includes raw data size */
     /* "storage" also includes H5D_COMPACT raw data size */
-    if(lout == H5D_COMPACT)
+    if (lout == H5D_COMPACT)
         iter->dset_ohdr_info.total_size -= storage;
 
     /* Track the layout type for dataset */
     (iter->dset_layouts[lout])++;
 
     /* Get the number of external files for the dataset */
-    if((num_ext = H5Pget_external_count(dcpl)) < 0)
+    if ((num_ext = H5Pget_external_count(dcpl)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Pget_external_count() failed");
 
     /* Accumulate raw data size accordingly */
-    if(num_ext) {
+    if (num_ext) {
         iter->nexternal += (unsigned long)num_ext;
         iter->dset_external_storage_size += (unsigned long)storage;
     }
@@ -548,37 +543,38 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         iter->dset_storage_size += storage;
 
     /* Gather dataspace statistics */
-    if((sid = H5Dget_space(did)) < 0)
+    if ((sid = H5Dget_space(did)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Sget_space() failed");
 
-    if((ndims = H5Sget_simple_extent_dims(sid, dims, NULL)) < 0)
+    if ((ndims = H5Sget_simple_extent_dims(sid, dims, NULL)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Sget_simple_extent_dims() failed");
 
     /* Check for larger rank of dataset */
-    if((unsigned)ndims > iter->max_dset_rank)
+    if ((unsigned)ndims > iter->max_dset_rank)
         iter->max_dset_rank = (unsigned)ndims;
 
     /* Track the number of datasets with each rank */
     (iter->dset_rank_count[ndims])++;
 
     /* Only gather dim size statistics on 1-D datasets */
-    if(ndims == 1) {
+    if (ndims == 1) {
         /* Determine maximum dimension size */
-        if(dims[0] > iter->max_dset_dims)
+        if (dims[0] > iter->max_dset_dims)
             iter->max_dset_dims = dims[0];
         /* Collect statistics for small datasets */
-        if(dims[0] < (hsize_t)sdsets_threshold)
+        if (dims[0] < (hsize_t)sdsets_threshold)
             (iter->small_dset_dims[(size_t)dims[0]])++;
 
         /* Add dim count to proper bin */
         bin = ceil_log10((unsigned long)dims[0]);
-        if((bin + 1) > iter->dset_dim_nbins) {
+        if ((bin + 1) > iter->dset_dim_nbins) {
             /* Allocate more storage for info about dataset's datatype */
-            if((iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins, (bin + 1) * sizeof(unsigned long))) == NULL)
+            if ((iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins,
+                                                                  (bin + 1) * sizeof(unsigned long))) == NULL)
                 H5TOOLS_GOTO_ERROR(FAIL, "H5Drealloc() failed");
 
             /* Initialize counts for intermediate bins */
-            while(iter->dset_dim_nbins < bin)
+            while (iter->dset_dim_nbins < bin)
                 iter->dset_dim_bins[iter->dset_dim_nbins++] = 0;
             iter->dset_dim_nbins++;
 
@@ -589,22 +585,22 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
             (iter->dset_dim_bins[bin])++;
     } /* end if */
 
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Sclose() failed");
 
     /* Gather datatype statistics */
-    if((tid = H5Dget_type(did)) < 0)
+    if ((tid = H5Dget_type(did)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Dget_type() failed");
 
     type_found = FALSE;
-    for(u = 0; u < iter->dset_ntypes; u++)
-        if(H5Tequal(iter->dset_type_info[u].tid, tid) > 0) {
+    for (u = 0; u < iter->dset_ntypes; u++)
+        if (H5Tequal(iter->dset_type_info[u].tid, tid) > 0) {
             type_found = TRUE;
             break;
         } /* end for */
 
-    if(type_found)
-         (iter->dset_type_info[u].count)++;
+    if (type_found)
+        (iter->dset_type_info[u].count)++;
     else {
         unsigned curr_ntype = (unsigned)iter->dset_ntypes;
 
@@ -612,11 +608,12 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         iter->dset_ntypes++;
 
         /* Allocate more storage for info about dataset's datatype */
-        if((iter->dset_type_info = (dtype_info_t *)HDrealloc(iter->dset_type_info, iter->dset_ntypes * sizeof(dtype_info_t))) == NULL)
+        if ((iter->dset_type_info = (dtype_info_t *)HDrealloc(
+                 iter->dset_type_info, iter->dset_ntypes * sizeof(dtype_info_t))) == NULL)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Drealloc() failed");
 
         /* Initialize information about datatype */
-        if((iter->dset_type_info[curr_ntype].tid = H5Tcopy(tid)) < 0)
+        if ((iter->dset_type_info[curr_ntype].tid = H5Tcopy(tid)) < 0)
             H5TOOLS_GOTO_ERROR(FAIL, "H5Tcopy() failed");
         iter->dset_type_info[curr_ntype].count = 1;
         iter->dset_type_info[curr_ntype].named = 0;
@@ -626,37 +623,36 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     } /* end else */
 
     /* Check if the datatype is a named datatype */
-    if(H5Tcommitted(tid) > 0)
+    if (H5Tcommitted(tid) > 0)
         (iter->dset_type_info[u].named)++;
 
-    if(H5Tclose(tid) < 0)
+    if (H5Tclose(tid) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Tclose() failed");
 
     /* Track different filters */
-    if((nfltr = H5Pget_nfilters(dcpl)) >= 0) {
-       if(nfltr == 0)
-           iter->dset_comptype[0]++;
-        for(u = 0; u < (unsigned)nfltr; u++) {
+    if ((nfltr = H5Pget_nfilters(dcpl)) >= 0) {
+        if (nfltr == 0)
+            iter->dset_comptype[0]++;
+        for (u = 0; u < (unsigned)nfltr; u++) {
             fltr = H5Pget_filter2(dcpl, u, 0, 0, 0, 0, 0, NULL);
-            if(fltr >= 0) {
-                if(fltr < (H5_NFILTERS_IMPL - 1))
+            if (fltr >= 0) {
+                if (fltr < (H5_NFILTERS_IMPL - 1))
                     iter->dset_comptype[fltr]++;
                 else
                     iter->dset_comptype[H5_NFILTERS_IMPL - 1]++; /*other filters*/
-            } /* end if */
-        } /* end for */
-    } /* endif nfltr */
+            }                                                    /* end if */
+        }                                                        /* end for */
+    }                                                            /* endif nfltr */
 
-     if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Pclose() failed");
 
-     if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Dclose() failed");
 
 done:
-     return ret_value;
-}  /* end dataset_stats() */
-
+    return ret_value;
+} /* end dataset_stats() */
 
 /*-------------------------------------------------------------------------
  * Function: datatype_stats
@@ -683,12 +679,11 @@ datatype_stats(iter_t *iter, const H5O_info_t *oi)
     iter->dtype_ohdr_info.free_size += oi->hdr.space.free;
 
     /* Update attribute metadata info */
-    if((ret_value = attribute_stats(iter, oi)) < 0)
+    if ((ret_value = attribute_stats(iter, oi)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "attribute_stats() failed");
 done:
-     return ret_value;
-}  /* end datatype_stats() */
-
+    return ret_value;
+} /* end datatype_stats() */
 
 /*-------------------------------------------------------------------------
  * Function: obj_stats
@@ -704,31 +699,30 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
-    void *_iter)
+obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited, void *_iter)
 {
-    iter_t *iter = (iter_t *)_iter;
-    herr_t ret_value = SUCCEED;
+    iter_t *iter      = (iter_t *)_iter;
+    herr_t  ret_value = SUCCEED;
 
     /* If the object has already been seen then just return */
-    if(NULL == already_visited) {
+    if (NULL == already_visited) {
         /* Gather some general statistics about the object */
-        if(oi->rc > iter->max_links)
+        if (oi->rc > iter->max_links)
             iter->max_links = oi->rc;
 
-        switch(oi->type) {
+        switch (oi->type) {
             case H5O_TYPE_GROUP:
-                if(group_stats(iter, path, oi) < 0)
+                if (group_stats(iter, path, oi) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "group_stats failed");
                 break;
 
             case H5O_TYPE_DATASET:
-                if(dataset_stats(iter, path, oi) < 0)
+                if (dataset_stats(iter, path, oi) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "dataset_stats failed");
                 break;
 
             case H5O_TYPE_NAMED_DATATYPE:
-                if(datatype_stats(iter, oi) < 0)
+                if (datatype_stats(iter, oi) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "datatype_stats failed");
                 break;
 
@@ -739,13 +733,12 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
                 iter->uniq_others++;
                 break;
         } /* end switch */
-    } /* end if */
+    }     /* end if */
 
 done:
     return ret_value;
 } /* end obj_stats() */
 
-
 /*-------------------------------------------------------------------------
  * Function: lnk_stats
  *
@@ -764,7 +757,7 @@ lnk_stats(const char H5_ATTR_UNUSED *path, const H5L_info_t *li, void *_iter)
 {
     iter_t *iter = (iter_t *)_iter;
 
-    switch(li->type) {
+    switch (li->type) {
         case H5L_TYPE_SOFT:
         case H5L_TYPE_EXTERNAL:
             /* Gather statistics about links and UD links */
@@ -797,11 +790,11 @@ lnk_stats(const char H5_ATTR_UNUSED *path, const H5L_info_t *li, void *_iter)
 static void
 hand_free(struct handler_t *hand)
 {
-    if(hand) {
+    if (hand) {
         unsigned u;
 
-        for(u = 0; u < hand->obj_count; u++)
-            if(hand->obj[u]) {
+        for (u = 0; u < hand->obj_count; u++)
+            if (hand->obj[u]) {
                 HDfree(hand->obj[u]);
                 hand->obj[u] = NULL;
             } /* end if */
@@ -811,7 +804,6 @@ hand_free(struct handler_t *hand)
     } /* end if */
 } /* end hand_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
@@ -829,13 +821,13 @@ hand_free(struct handler_t *hand)
 static int
 parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
 {
-    int                opt;
-    unsigned           u;
-    struct handler_t   *hand = NULL;
+    int               opt;
+    unsigned          u;
+    struct handler_t *hand = NULL;
 
     /* parse command line options */
-    while((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-        switch((char)opt) {
+    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+        switch ((char)opt) {
             case 'h':
                 usage(h5tools_getprogname());
                 h5tools_setstatus(EXIT_SUCCESS);
@@ -853,29 +845,29 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'F':
-                display_all = FALSE;
+                display_all           = FALSE;
                 display_file_metadata = TRUE;
                 break;
 
             case 'f':
-                display_all = FALSE;
+                display_all  = FALSE;
                 display_file = TRUE;
                 break;
 
             case 'G':
-                display_all = FALSE;
+                display_all            = FALSE;
                 display_group_metadata = TRUE;
                 break;
 
             case 'g':
-                display_all = FALSE;
+                display_all   = FALSE;
                 display_group = TRUE;
                 break;
 
             case 'l':
-                if(opt_arg) {
+                if (opt_arg) {
                     sgroups_threshold = HDatoi(opt_arg);
-                    if(sgroups_threshold < 1) {
+                    if (sgroups_threshold < 1) {
                         error_msg("Invalid threshold for small groups\n");
                         goto error;
                     }
@@ -886,19 +878,19 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'D':
-                display_all = FALSE;
+                display_all           = FALSE;
                 display_dset_metadata = TRUE;
                 break;
 
             case 'd':
-                display_all = FALSE;
+                display_all  = FALSE;
                 display_dset = TRUE;
                 break;
 
             case 'm':
-                if(opt_arg) {
+                if (opt_arg) {
                     sdsets_threshold = HDatoi(opt_arg);
-                    if(sdsets_threshold < 1) {
+                    if (sdsets_threshold < 1) {
                         error_msg("Invalid threshold for small datasets\n");
                         goto error;
                     }
@@ -909,19 +901,19 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'T':
-                display_all = FALSE;
+                display_all             = FALSE;
                 display_dset_dtype_meta = TRUE;
                 break;
 
             case 'A':
-                display_all = FALSE;
+                display_all  = FALSE;
                 display_attr = TRUE;
                 break;
 
             case 'a':
-                if(opt_arg) {
+                if (opt_arg) {
                     sattrs_threshold = HDatoi(opt_arg);
-                    if(sattrs_threshold < 1) {
+                    if (sattrs_threshold < 1) {
                         error_msg("Invalid threshold for small # of attributes\n");
                         goto error;
                     }
@@ -932,30 +924,30 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'S':
-                display_all = FALSE;
+                display_all     = FALSE;
                 display_summary = TRUE;
                 break;
 
             case 'O':
-                display_all = FALSE;
+                display_all    = FALSE;
                 display_object = TRUE;
 
                 /* Allocate space to hold the command line info */
-                if(NULL == (hand = (struct handler_t *)HDcalloc((size_t)1, sizeof(struct handler_t)))) {
+                if (NULL == (hand = (struct handler_t *)HDcalloc((size_t)1, sizeof(struct handler_t)))) {
                     error_msg("unable to allocate memory for object struct\n");
                     goto error;
                 } /* end if */
 
                 /* Allocate space to hold the object strings */
                 hand->obj_count = (size_t)argc;
-                if(NULL == (hand->obj = (char **)HDcalloc((size_t)argc, sizeof(char *)))) {
+                if (NULL == (hand->obj = (char **)HDcalloc((size_t)argc, sizeof(char *)))) {
                     error_msg("unable to allocate memory for object array\n");
                     goto error;
                 } /* end if */
 
                 /* Store object names */
-                for(u = 0; u < hand->obj_count; u++)
-                    if(NULL == (hand->obj[u] = HDstrdup(opt_arg))) {
+                for (u = 0; u < hand->obj_count; u++)
+                    if (NULL == (hand->obj[u] = HDstrdup(opt_arg))) {
                         error_msg("unable to allocate memory for object name\n");
                         goto error;
                     } /* end if */
@@ -966,30 +958,30 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 error_msg("Read-Only S3 VFD not enabled.\n");
                 goto error;
 #else
-                {
-                    char        *cred_str = NULL;
-                    unsigned     nelems   = 0;
-                    char       **cred     = NULL;
-                    char const  *ccred[3];
-
-                    if (FAIL == parse_tuple((const char *)opt_arg, ',', &cred_str, &nelems, &cred)) {
-                        error_msg("Unable to parse s3 credential\n");
-                        goto error;
-                    }
-                    if (nelems != 3) {
-                        error_msg("s3 credential must have three elements\n");
-                        goto error;
-                    }
-                    ccred[0] = (const char *)cred[0];
-                    ccred[1] = (const char *)cred[1];
-                    ccred[2] = (const char *)cred[2];
-                    if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
-                        error_msg("Unable to set ros3 fapl config\n");
-                        goto error;
-                    }
-                    HDfree(cred);
-                    HDfree(cred_str);
-                } /* parse s3-cred block */
+            {
+                char *      cred_str = NULL;
+                unsigned    nelems   = 0;
+                char **     cred     = NULL;
+                char const *ccred[3];
+
+                if (FAIL == parse_tuple((const char *)opt_arg, ',', &cred_str, &nelems, &cred)) {
+                    error_msg("Unable to parse s3 credential\n");
+                    goto error;
+                }
+                if (nelems != 3) {
+                    error_msg("s3 credential must have three elements\n");
+                    goto error;
+                }
+                ccred[0] = (const char *)cred[0];
+                ccred[1] = (const char *)cred[1];
+                ccred[2] = (const char *)cred[2];
+                if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
+                    error_msg("Unable to set ros3 fapl config\n");
+                    goto error;
+                }
+                HDfree(cred);
+                HDfree(cred_str);
+            } /* parse s3-cred block */
                 drivername = "ros3";
                 break;
 #endif /* H5_HAVE_ROS3_VFD */
@@ -999,75 +991,73 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 error_msg("HDFS VFD is not enabled.\n");
                 goto error;
 #else
-                {
-                    unsigned         nelems    = 0;
-                    char            *props_src = NULL;
-                    char           **props     = NULL;
-                    unsigned long    k         = 0;
-                    if (FAIL == parse_tuple((const char *)opt_arg,
-                            ',', &props_src, &nelems, &props)) {
-                        error_msg("unable to parse hdfs properties tuple\n");
+            {
+                unsigned      nelems    = 0;
+                char *        props_src = NULL;
+                char **       props     = NULL;
+                unsigned long k         = 0;
+                if (FAIL == parse_tuple((const char *)opt_arg, ',', &props_src, &nelems, &props)) {
+                    error_msg("unable to parse hdfs properties tuple\n");
+                    goto error;
+                }
+                /* sanity-check tuple count
+                 */
+                if (nelems != 5) {
+                    char str[64] = "";
+                    HDsprintf(str,
+                              "expected 5 elements in hdfs properties tuple "
+                              "but found %u\n",
+                              nelems);
+                    HDfree(props);
+                    HDfree(props_src);
+                    error_msg(str);
+                    goto error;
+                }
+                /* Populate fapl configuration structure with given
+                 * properties.
+                 * TODO/WARNING: No error-checking is done on length of
+                 *         input strings... Silent overflow is possible,
+                 *         albeit unlikely.
+                 */
+                if (HDstrncmp(props[0], "", 1)) {
+                    HDstrncpy(hdfs_fa.namenode_name, (const char *)props[0], HDstrlen(props[0]));
+                }
+                if (HDstrncmp(props[1], "", 1)) {
+                    k = strtoul((const char *)props[1], NULL, 0);
+                    if (errno == ERANGE) {
+                        error_msg("supposed port number wasn't.\n");
                         goto error;
                     }
-                    /* sanity-check tuple count
-                     */
-                    if (nelems != 5) {
-                        char str[64] = "";
-                        HDsprintf(str,
-                                "expected 5 elements in hdfs properties tuple "
-                                "but found %u\n",
-                                nelems);
-                        HDfree(props);
-                        HDfree(props_src);
-                        error_msg(str);
+                    hdfs_fa.namenode_port = (int32_t)k;
+                }
+                if (HDstrncmp(props[2], "", 1)) {
+                    HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
+                }
+                if (HDstrncmp(props[3], "", 1)) {
+                    HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
+                }
+                if (strncmp(props[4], "", 1)) {
+                    k = HDstrtoul((const char *)props[4], NULL, 0);
+                    if (errno == ERANGE) {
+                        error_msg("supposed buffersize number wasn't.\n");
                         goto error;
                     }
-                    /* Populate fapl configuration structure with given
-                     * properties.
-                     * TODO/WARNING: No error-checking is done on length of
-                     *         input strings... Silent overflow is possible,
-                     *         albeit unlikely.
-                     */
-                    if (HDstrncmp(props[0], "", 1)) {
-                        HDstrncpy(hdfs_fa.namenode_name,(const char *)props[0], HDstrlen(props[0]));
-                    }
-                    if (HDstrncmp(props[1], "", 1)) {
-                        k = strtoul((const char *)props[1], NULL, 0);
-                        if (errno == ERANGE) {
-                            error_msg("supposed port number wasn't.\n");
-                            goto error;
-                        }
-                        hdfs_fa.namenode_port = (int32_t)k;
-                    }
-                    if (HDstrncmp(props[2], "", 1)) {
-                        HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
-                    }
-                    if (HDstrncmp(props[3], "", 1)) {
-                        HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
-                    }
-                    if (strncmp(props[4], "", 1)) {
-                        k = HDstrtoul((const char *)props[4], NULL, 0);
-                        if (errno == ERANGE) {
-                            error_msg("supposed buffersize number wasn't.\n");
-                            goto error;
-                        }
-                        hdfs_fa.stream_buffer_size = (int32_t)k;
-                    }
-                    HDfree(props);
-                    HDfree(props_src);
-                    drivername = "hdfs";
+                    hdfs_fa.stream_buffer_size = (int32_t)k;
                 }
-                break;
+                HDfree(props);
+                HDfree(props_src);
+                drivername = "hdfs";
+            } break;
 #endif /* H5_HAVE_LIBHDFS */
 
             default:
                 usage(h5tools_getprogname());
                 goto error;
         } /* end switch */
-    } /* end while */
+    }     /* end while */
 
     /* check for file name to be processed */
-    if(argc <= opt_ind) {
+    if (argc <= opt_ind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
         goto error;
@@ -1086,7 +1076,6 @@ error:
     return -1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function: iter_free
  *
@@ -1103,50 +1092,49 @@ iter_free(iter_t *iter)
 {
 
     /* Clear array of bins for group counts */
-    if(iter->group_bins) {
+    if (iter->group_bins) {
         HDfree(iter->group_bins);
         iter->group_bins = NULL;
     } /* end if */
 
     /* Clear array for tracking small groups */
-    if(iter->num_small_groups) {
+    if (iter->num_small_groups) {
         HDfree(iter->num_small_groups);
         iter->num_small_groups = NULL;
     } /* end if */
 
     /* Clear array of bins for attribute counts */
-    if(iter->attr_bins) {
+    if (iter->attr_bins) {
         HDfree(iter->attr_bins);
         iter->attr_bins = NULL;
     } /* end if */
 
     /* Clear array for tracking small attributes */
-    if(iter->num_small_attrs) {
+    if (iter->num_small_attrs) {
         HDfree(iter->num_small_attrs);
-        iter->num_small_attrs= NULL;
+        iter->num_small_attrs = NULL;
     } /* end if */
 
     /* Clear dataset datatype information found */
-    if(iter->dset_type_info) {
+    if (iter->dset_type_info) {
         HDfree(iter->dset_type_info);
         iter->dset_type_info = NULL;
     } /* end if */
 
     /* Clear array of bins for dataset dimensions */
-    if(iter->dset_dim_bins) {
+    if (iter->dset_dim_bins) {
         HDfree(iter->dset_dim_bins);
         iter->dset_dim_bins = NULL;
     } /* end if */
 
     /* Clear array of tracking 1-D small datasets */
-    if(iter->small_dset_dims) {
+    if (iter->small_dset_dims) {
         HDfree(iter->small_dset_dims);
         iter->small_dset_dims = NULL;
     } /* end if */
 
 } /* end iter_free() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_file_info
  *
@@ -1178,7 +1166,6 @@ print_file_info(const iter_t *iter)
     return 0;
 } /* print_file_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_file_metadata
  *
@@ -1202,11 +1189,11 @@ print_file_metadata(const iter_t *iter)
 
     HDfprintf(stdout, "\tObject headers: (total/unused)\n");
     HDfprintf(stdout, "\t\tGroups: %Hu/%Hu\n", iter->group_ohdr_info.total_size,
-            iter->group_ohdr_info.free_size);
-    HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n",
-            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+              iter->group_ohdr_info.free_size);
+    HDfprintf(stdout, "\t\tDatasets(exclude compact data): %Hu/%Hu\n", iter->dset_ohdr_info.total_size,
+              iter->dset_ohdr_info.free_size);
     HDfprintf(stdout, "\t\tDatatypes: %Hu/%Hu\n", iter->dtype_ohdr_info.total_size,
-            iter->dtype_ohdr_info.free_size);
+              iter->dtype_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tGroups:\n");
     HDfprintf(stdout, "\t\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
@@ -1230,7 +1217,6 @@ print_file_metadata(const iter_t *iter)
     return 0;
 } /* print_file_metadata() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_group_info
  *
@@ -1253,32 +1239,32 @@ print_file_metadata(const iter_t *iter)
 static herr_t
 print_group_info(const iter_t *iter)
 {
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
+    unsigned long power; /* Temporary "power" for bins */
+    unsigned long total; /* Total count for various statistics */
+    unsigned      u;     /* Local index variable */
 
-    HDprintf("Small groups (with 0 to %u links):\n", sgroups_threshold-1);
+    HDprintf("Small groups (with 0 to %u links):\n", sgroups_threshold - 1);
     total = 0;
-    for(u = 0; u < (unsigned)sgroups_threshold; u++) {
-        if(iter->num_small_groups[u] > 0) {
+    for (u = 0; u < (unsigned)sgroups_threshold; u++) {
+        if (iter->num_small_groups[u] > 0) {
             HDprintf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]);
             total += iter->num_small_groups[u];
         } /* end if */
-    } /* end for */
+    }     /* end for */
     HDprintf("\tTotal # of small groups: %lu\n", total);
 
     HDprintf("Group bins:\n");
     total = 0;
-    if((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
-       HDprintf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
-       total = iter->group_bins[0];
+    if ((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) {
+        HDprintf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]);
+        total = iter->group_bins[0];
     } /* end if */
     power = 1;
-    for(u = 1; u < iter->group_nbins; u++) {
-        if(iter->group_bins[u] > 0) {
-           HDprintf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
-                    iter->group_bins[u]);
-           total += iter->group_bins[u];
+    for (u = 1; u < iter->group_nbins; u++) {
+        if (iter->group_bins[u] > 0) {
+            HDprintf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1,
+                     iter->group_bins[u]);
+            total += iter->group_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
@@ -1287,7 +1273,6 @@ print_group_info(const iter_t *iter)
     return 0;
 } /* print_group_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_group_metadata
  *
@@ -1305,8 +1290,8 @@ print_group_metadata(const iter_t *iter)
 {
     HDprintf("File space information for groups' metadata (in bytes):\n");
 
-    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
-            iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
+    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n", iter->group_ohdr_info.total_size,
+              iter->group_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
     HDfprintf(stdout, "\tHeap: %Hu\n", iter->groups_heap_storage_size);
@@ -1314,7 +1299,6 @@ print_group_metadata(const iter_t *iter)
     return 0;
 } /* print_group_metadata() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_dataset_info
  *
@@ -1331,44 +1315,43 @@ print_group_metadata(const iter_t *iter)
 static herr_t
 print_dataset_info(const iter_t *iter)
 {
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
+    unsigned long power; /* Temporary "power" for bins */
+    unsigned long total; /* Total count for various statistics */
+    unsigned      u;     /* Local index variable */
 
-    if(iter->uniq_dsets > 0) {
+    if (iter->uniq_dsets > 0) {
         HDprintf("Dataset dimension information:\n");
         HDprintf("\tMax. rank of datasets: %u\n", iter->max_dset_rank);
         HDprintf("\tDataset ranks:\n");
-        for(u = 0; u < H5S_MAX_RANK; u++)
-            if(iter->dset_rank_count[u] > 0)
+        for (u = 0; u < H5S_MAX_RANK; u++)
+            if (iter->dset_rank_count[u] > 0)
                 HDprintf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]);
 
         HDprintf("1-D Dataset information:\n");
         HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %Hu\n", iter->max_dset_dims);
         HDprintf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1);
         total = 0;
-        for(u = 0; u < (unsigned)sdsets_threshold; u++) {
-            if(iter->small_dset_dims[u] > 0) {
-                HDprintf("\t\t# of datasets with dimension sizes %u: %lu\n", u,
-                         iter->small_dset_dims[u]);
+        for (u = 0; u < (unsigned)sdsets_threshold; u++) {
+            if (iter->small_dset_dims[u] > 0) {
+                HDprintf("\t\t# of datasets with dimension sizes %u: %lu\n", u, iter->small_dset_dims[u]);
                 total += iter->small_dset_dims[u];
             } /* end if */
-        } /* end for */
+        }     /* end for */
         HDprintf("\t\tTotal # of small datasets: %lu\n", total);
 
         /* Protect against no datasets in file */
-        if(iter->dset_dim_nbins > 0) {
+        if (iter->dset_dim_nbins > 0) {
             HDprintf("\t1-D Dataset dimension bins:\n");
             total = 0;
-            if(iter->dset_dim_bins[0] > 0) {
+            if (iter->dset_dim_bins[0] > 0) {
                 HDprintf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]);
                 total = iter->dset_dim_bins[0];
             } /* end if */
             power = 1;
-            for(u = 1; u < iter->dset_dim_nbins; u++) {
-                if(iter->dset_dim_bins[u] > 0) {
-                    HDprintf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1,
-                             iter->dset_dim_bins[u]);
+            for (u = 1; u < iter->dset_dim_nbins; u++) {
+                if (iter->dset_dim_bins[u] > 0) {
+                    HDprintf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power,
+                             (power * 10) - 1, iter->dset_dim_bins[u]);
                     total += iter->dset_dim_bins[u];
                 } /* end if */
                 power *= 10;
@@ -1381,27 +1364,29 @@ print_dataset_info(const iter_t *iter)
         HDfprintf(stdout, "\tTotal external raw data size: %Hu\n", iter->dset_external_storage_size);
 
         HDprintf("Dataset layout information:\n");
-        for(u = 0; u < H5D_NLAYOUTS; u++)
-            HDprintf("\tDataset layout counts[%s]: %lu\n", (u == H5D_COMPACT ? "COMPACT" :
-                (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "ERROR"))), iter->dset_layouts[u]);
+        for (u = 0; u < H5D_NLAYOUTS; u++)
+            HDprintf("\tDataset layout counts[%s]: %lu\n",
+                     (u == H5D_COMPACT
+                          ? "COMPACT"
+                          : (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "ERROR"))),
+                     iter->dset_layouts[u]);
         HDprintf("\tNumber of external files : %lu\n", iter->nexternal);
 
         HDprintf("Dataset filters information:\n");
         HDprintf("\tNumber of datasets with:\n");
-        HDprintf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR+1]);
+        HDprintf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR + 1]);
         HDprintf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]);
         HDprintf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]);
         HDprintf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]);
         HDprintf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]);
         HDprintf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]);
         HDprintf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]);
-        HDprintf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL-1]);
+        HDprintf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL - 1]);
     } /* end if */
 
     return 0;
 } /* print_dataset_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_dataset_metadata
  *
@@ -1420,17 +1405,15 @@ print_dset_metadata(const iter_t *iter)
 {
     HDprintf("File space information for datasets' metadata (in bytes):\n");
 
-    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
-            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+    HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n", iter->dset_ohdr_info.total_size,
+              iter->dset_ohdr_info.free_size);
 
-    HDfprintf(stdout, "\tIndex for Chunked datasets: %Hu\n",
-            iter->datasets_index_storage_size);
+    HDfprintf(stdout, "\tIndex for Chunked datasets: %Hu\n", iter->datasets_index_storage_size);
     HDfprintf(stdout, "\tHeap: %Hu\n", iter->datasets_heap_storage_size);
 
     return 0;
 } /* print_dset_metadata() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_dset_dtype_meta
  *
@@ -1447,21 +1430,21 @@ print_dset_metadata(const iter_t *iter)
 static herr_t
 print_dset_dtype_meta(const iter_t *iter)
 {
-    unsigned long total;        /* Total count for various statistics */
-    size_t   dtype_size;        /* Size of encoded datatype */
-    unsigned u;                 /* Local index variable */
+    unsigned long total;      /* Total count for various statistics */
+    size_t        dtype_size; /* Size of encoded datatype */
+    unsigned      u;          /* Local index variable */
 
-    if(iter->dset_ntypes) {
+    if (iter->dset_ntypes) {
         HDprintf("Dataset datatype information:\n");
         HDprintf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
         total = 0;
-        for(u = 0; u < iter->dset_ntypes; u++) {
+        for (u = 0; u < iter->dset_ntypes; u++) {
             H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
             HDprintf("\tDataset datatype #%u:\n", u);
-            HDprintf("\t\tCount (total/named) = (%lu/%lu)\n",
-                    iter->dset_type_info[u].count, iter->dset_type_info[u].named);
+            HDprintf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count,
+                     iter->dset_type_info[u].named);
             HDprintf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
-                    (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
+                     (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
             H5Tclose(iter->dset_type_info[u].tid);
             total += iter->dset_type_info[u].count;
         } /* end for */
@@ -1471,7 +1454,6 @@ print_dset_dtype_meta(const iter_t *iter)
     return 0;
 } /* print_dset_dtype_meta() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_attr_info
  *
@@ -1489,28 +1471,28 @@ print_dset_dtype_meta(const iter_t *iter)
 static herr_t
 print_attr_info(const iter_t *iter)
 {
-    unsigned long power;        /* Temporary "power" for bins */
-    unsigned long total;        /* Total count for various statistics */
-    unsigned u;                 /* Local index variable */
+    unsigned long power; /* Temporary "power" for bins */
+    unsigned long total; /* Total count for various statistics */
+    unsigned      u;     /* Local index variable */
 
     HDprintf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold);
     total = 0;
-    for(u = 1; u <= (unsigned)sattrs_threshold; u++) {
-        if(iter->num_small_attrs[u] > 0) {
+    for (u = 1; u <= (unsigned)sattrs_threshold; u++) {
+        if (iter->num_small_attrs[u] > 0) {
             HDprintf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]);
             total += iter->num_small_attrs[u];
         } /* end if */
-    } /* end for */
+    }     /* end for */
     HDprintf("\tTotal # of objects with small # of attributes: %lu\n", total);
 
     HDprintf("Attribute bins:\n");
     total = 0;
     power = 1;
-    for(u = 1; u < iter->attr_nbins; u++) {
-        if(iter->attr_bins[u] > 0) {
-           HDprintf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
-                    iter->attr_bins[u]);
-           total += iter->attr_bins[u];
+    for (u = 1; u < iter->attr_nbins; u++) {
+        if (iter->attr_bins[u] > 0) {
+            HDprintf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1,
+                     iter->attr_bins[u]);
+            total += iter->attr_bins[u];
         } /* end if */
         power *= 10;
     } /* end for */
@@ -1520,7 +1502,6 @@ print_attr_info(const iter_t *iter)
     return 0;
 } /* print_attr_info() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_storage_summary
  *
@@ -1538,29 +1519,21 @@ static herr_t
 print_storage_summary(const iter_t *iter)
 {
     hsize_t total_meta = 0;
-    hsize_t unaccount = 0;
+    hsize_t unaccount  = 0;
 
     HDprintf("Summary of file space information:\n");
-    total_meta =
-            iter->super_ext_size + iter->ublk_size +
-            iter->group_ohdr_info.total_size +
-            iter->dset_ohdr_info.total_size +
-            iter->dtype_ohdr_info.total_size +
-            iter->groups_btree_storage_size +
-            iter->groups_heap_storage_size +
-            iter->attrs_btree_storage_size +
-            iter->attrs_heap_storage_size +
-            iter->datasets_index_storage_size +
-            iter->datasets_heap_storage_size +
-            iter->SM_hdr_storage_size +
-            iter->SM_index_storage_size +
-            iter->SM_heap_storage_size;
+    total_meta = iter->super_ext_size + iter->ublk_size + iter->group_ohdr_info.total_size +
+                 iter->dset_ohdr_info.total_size + iter->dtype_ohdr_info.total_size +
+                 iter->groups_btree_storage_size + iter->groups_heap_storage_size +
+                 iter->attrs_btree_storage_size + iter->attrs_heap_storage_size +
+                 iter->datasets_index_storage_size + iter->datasets_heap_storage_size +
+                 iter->SM_hdr_storage_size + iter->SM_index_storage_size + iter->SM_heap_storage_size;
 
     HDfprintf(stdout, "  File metadata: %Hu bytes\n", total_meta);
     HDfprintf(stdout, "  Raw data: %Hu bytes\n", iter->dset_storage_size);
 
-    if(iter->filesize < (total_meta + iter->dset_storage_size)) {
-        unaccount = (total_meta + iter->dset_storage_size ) - iter->filesize;
+    if (iter->filesize < (total_meta + iter->dset_storage_size)) {
+        unaccount = (total_meta + iter->dset_storage_size) - iter->filesize;
         HDfprintf(stdout, "  ??? File has %Hu more bytes accounted for than its size! ???\n", unaccount);
     }
     else {
@@ -1570,13 +1543,12 @@ print_storage_summary(const iter_t *iter)
 
     HDfprintf(stdout, "Total space: %Hu bytes\n", total_meta + iter->dset_storage_size + unaccount);
 
-    if(iter->nexternal)
+    if (iter->nexternal)
         HDfprintf(stdout, "External raw data: %Hu bytes\n", iter->dset_external_storage_size);
 
     return 0;
 } /* print_storage_summary() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_file_statistics
  *
@@ -1594,34 +1566,42 @@ print_storage_summary(const iter_t *iter)
 static void
 print_file_statistics(const iter_t *iter)
 {
-    if(display_all) {
-        display_file = TRUE;
-        display_group = TRUE;
-        display_dset = TRUE;
+    if (display_all) {
+        display_file            = TRUE;
+        display_group           = TRUE;
+        display_dset            = TRUE;
         display_dset_dtype_meta = TRUE;
-        display_attr = TRUE;
-        display_summary = TRUE;
+        display_attr            = TRUE;
+        display_summary         = TRUE;
 
-        display_file_metadata = TRUE;
+        display_file_metadata  = TRUE;
         display_group_metadata = TRUE;
-        display_dset_metadata = TRUE;
+        display_dset_metadata  = TRUE;
     }
 
-    if(display_file)            print_file_info(iter);
-    if(display_file_metadata)   print_file_metadata(iter);
-
-    if(display_group)           print_group_info(iter);
-    if(!display_all && display_group_metadata)   print_group_metadata(iter);
-
-    if(display_dset)            print_dataset_info(iter);
-    if(display_dset_dtype_meta) print_dset_dtype_meta(iter);
-    if(!display_all && display_dset_metadata)   print_dset_metadata(iter);
-
-    if(display_attr)            print_attr_info(iter);
-    if(display_summary)         print_storage_summary(iter);
+    if (display_file)
+        print_file_info(iter);
+    if (display_file_metadata)
+        print_file_metadata(iter);
+
+    if (display_group)
+        print_group_info(iter);
+    if (!display_all && display_group_metadata)
+        print_group_metadata(iter);
+
+    if (display_dset)
+        print_dataset_info(iter);
+    if (display_dset_dtype_meta)
+        print_dset_dtype_meta(iter);
+    if (!display_all && display_dset_metadata)
+        print_dset_metadata(iter);
+
+    if (display_attr)
+        print_attr_info(iter);
+    if (display_summary)
+        print_storage_summary(iter);
 } /* print_file_statistics() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_object_statistics
  *
@@ -1644,7 +1624,6 @@ print_object_statistics(const char *name)
     HDprintf("Object name %s\n", name);
 } /* print_object_statistics() */
 
-
 /*-------------------------------------------------------------------------
  * Function: print_statistics
  *
@@ -1664,13 +1643,12 @@ print_object_statistics(const char *name)
 static void
 print_statistics(const char *name, const iter_t *iter)
 {
-    if(display_object)
+    if (display_object)
         print_object_statistics(name);
     else
         print_file_statistics(iter);
 } /* print_statistics() */
 
-
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -1683,15 +1661,15 @@ print_statistics(const char *name, const iter_t *iter)
 int
 main(int argc, const char *argv[])
 {
-    iter_t              iter;
-    const char         *fname = NULL;
-    hid_t               fid = H5I_INVALID_HID;
-    H5E_auto2_t         func;
-    H5E_auto2_t         tools_func;
-    void               *edata;
-    void               *tools_edata;
-    struct handler_t   *hand = NULL;
-    hid_t               fapl_id = H5P_DEFAULT;
+    iter_t            iter;
+    const char *      fname = NULL;
+    hid_t             fid   = H5I_INVALID_HID;
+    H5E_auto2_t       func;
+    H5E_auto2_t       tools_func;
+    void *            edata;
+    void *            tools_edata;
+    struct handler_t *hand    = NULL;
+    hid_t             fapl_id = H5P_DEFAULT;
 
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);
@@ -1709,7 +1687,7 @@ main(int argc, const char *argv[])
 
     HDmemset(&iter, 0, sizeof(iter));
 
-    if(parse_command_line(argc, argv, &hand) < 0)
+    if (parse_command_line(argc, argv, &hand) < 0)
         goto done;
 
     /* if drivername is not null, probably need to set the fapl */
@@ -1723,7 +1701,6 @@ main(int argc, const char *argv[])
 #else
             conf_fa = (void *)&ros3_fa;
 #endif /* H5_HAVE_ROS3_VFD */
-
         }
         else if (!HDstrcmp(drivername, "hdfs")) {
 #ifndef H5_HAVE_LIBHDFS
@@ -1750,20 +1727,20 @@ main(int argc, const char *argv[])
 
     fname = argv[opt_ind];
 
-    if(enable_error_stack > 0) {
+    if (enable_error_stack > 0) {
         H5Eset_auto2(H5E_DEFAULT, func, edata);
         H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata);
     }
 
     /* Check for filename given */
-    if(fname) {
-        hid_t               fcpl;
-        H5F_info_t          finfo;
+    if (fname) {
+        hid_t      fcpl;
+        H5F_info_t finfo;
 
         HDprintf("Filename: %s\n", fname);
 
         fid = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT);
-        if(fid < 0) {
+        if (fid < 0) {
             error_msg("unable to open file \"%s\"\n", fname);
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
@@ -1772,58 +1749,59 @@ main(int argc, const char *argv[])
         /* Initialize iter structure */
         iter.fid = fid;
 
-        if(H5Fget_filesize(fid, &iter.filesize) < 0)
+        if (H5Fget_filesize(fid, &iter.filesize) < 0)
             warn_msg("Unable to retrieve file size\n");
         HDassert(iter.filesize != 0);
 
         /* Get storge info for file-level structures */
-        if(H5Fget_info(fid, &finfo) < 0)
+        if (H5Fget_info(fid, &finfo) < 0)
             warn_msg("Unable to retrieve file info\n");
         else {
-            iter.super_ext_size = finfo.super_ext_size;
-            iter.SM_hdr_storage_size = finfo.sohm.hdr_size;
+            iter.super_ext_size        = finfo.super_ext_size;
+            iter.SM_hdr_storage_size   = finfo.sohm.hdr_size;
             iter.SM_index_storage_size = finfo.sohm.msgs_info.index_size;
-            iter.SM_heap_storage_size = finfo.sohm.msgs_info.heap_size;
+            iter.SM_heap_storage_size  = finfo.sohm.msgs_info.heap_size;
         } /* end else */
 
         iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
-        iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
+        iter.num_small_attrs =
+            (unsigned long *)HDcalloc((size_t)(sattrs_threshold + 1), sizeof(unsigned long));
         iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
 
-        if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
+        if (iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
             error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
 
-        if((fcpl = H5Fget_create_plist(fid)) < 0)
+        if ((fcpl = H5Fget_create_plist(fid)) < 0)
             warn_msg("Unable to retrieve file creation property\n");
 
-        if(H5Pget_userblock(fcpl, &iter.ublk_size) < 0)
+        if (H5Pget_userblock(fcpl, &iter.ublk_size) < 0)
             warn_msg("Unable to retrieve userblock size\n");
 
         /* Walk the objects or all file */
-        if(display_object) {
+        if (display_object) {
             unsigned u;
 
-            for(u = 0; u < hand->obj_count; u++) {
-                if(h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0) {
+            for (u = 0; u < hand->obj_count; u++) {
+                if (h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0) {
                     error_msg("unable to traverse object \"%s\"\n", hand->obj[u]);
                     h5tools_setstatus(EXIT_FAILURE);
                 }
                 else
                     print_statistics(hand->obj[u], &iter);
             } /* end for */
-        } /* end if */
+        }     /* end if */
         else {
-            if(h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0) {
+            if (h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter) < 0) {
                 error_msg("unable to traverse objects/links in file \"%s\"\n", fname);
                 h5tools_setstatus(EXIT_FAILURE);
             }
             else
                 print_statistics("/", &iter);
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     hand_free(hand);
@@ -1838,7 +1816,7 @@ done:
         }
     }
 
-    if(fid >= 0 && H5Fclose(fid) < 0) {
+    if (fid >= 0 && H5Fclose(fid) < 0) {
         error_msg("unable to close file \"%s\"\n", fname);
         h5tools_setstatus(EXIT_FAILURE);
     } /* end if */
@@ -1847,4 +1825,3 @@ done:
 
     leave(h5tools_getstatus());
 } /* end main() */
-