Source formatted

2 files changed, 321 insertions, 319 deletions

diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c
index 2fbbec4..2f54199 100644
--- a/tools/test/h5format_convert/h5fc_chk_idx.c
+++ b/tools/test/h5format_convert/h5fc_chk_idx.c
@@ -43,16 +43,16 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    char *fname = NULL;
-    char *dname = NULL;
-    hid_t fid = H5I_INVALID_HID;
-    hid_t did = H5I_INVALID_HID;
+    char *            fname = NULL;
+    char *            dname = NULL;
+    hid_t             fid   = H5I_INVALID_HID;
+    hid_t             did   = H5I_INVALID_HID;
     H5D_chunk_index_t idx_type;
 
     /* h5fc_chk_idx fname dname */
-    if(argc != 3) {
-	usage();
-	HDexit(EXIT_FAILURE);
+    if (argc != 3) {
+        usage();
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Duplicate the file name  & dataset name */
@@ -60,42 +60,41 @@ main(int argc, char *argv[])
     dname = HDstrdup(argv[2]);
 
     /* Try opening the file */
-    if((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
-	HDfprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
-	HDexit(EXIT_FAILURE);
+    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
+        HDfprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
-	HDfprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n");
-	HDexit(EXIT_FAILURE);
+    if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
+        HDfprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Get the dataset's chunk indexing type */
-    if(H5Dget_chunk_index_type(did, &idx_type) < 0) {
-	HDfprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n");
-	HDexit(EXIT_FAILURE);
+    if (H5Dget_chunk_index_type(did, &idx_type) < 0) {
+        HDfprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Close the dataset */
-    if(H5Dclose(did) < 0) {
-	HDfprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n");
-	HDexit(EXIT_FAILURE);
+    if (H5Dclose(did) < 0) {
+        HDfprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Close the file */
-    if(H5Fclose(fid) < 0) {
-	HDfprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n");
-	HDexit(EXIT_FAILURE);
+    if (H5Fclose(fid) < 0) {
+        HDfprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Return success when the chunk indexing type is version 1 B-tree */
-    if(idx_type == H5D_CHUNK_IDX_BTREE)
-	HDexit(EXIT_SUCCESS);
+    if (idx_type == H5D_CHUNK_IDX_BTREE)
+        HDexit(EXIT_SUCCESS);
     else {
-	HDfprintf(stderr, "Error: chunk indexing type is %d\n", idx_type);
-	HDexit(EXIT_FAILURE);
+        HDfprintf(stderr, "Error: chunk indexing type is %d\n", idx_type);
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
 } /* main() */
-
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 1e9e2cf..8e05854 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -24,45 +24,42 @@
 #include "hdf5.h"
 #include "H5private.h"
 
-#define NON_V3_FILE        "h5fc_non_v3.h5"
-#define EDGE_V3_FILE        "h5fc_edge_v3.h5"
-#define ERR_LEVEL_FILE        "h5fc_err_level.h5"
-
-const char *FILENAME[] = {
-    "h5fc_ext1_i.h5",    /* 0 */
-    "h5fc_ext1_s.h5",    /* 1 */
-    "h5fc_ext1_f.h5",    /* 2 */
-    "h5fc_ext2_is.h5",     /* 3 */
-    "h5fc_ext2_if.h5",    /* 4 */
-    "h5fc_ext2_sf.h5",     /* 5 */
-    "h5fc_ext3_isf.h5",    /* 6 */
-    "h5fc_ext_none.h5",    /* 7 */
-    NULL
-};
-
-#define GROUP            "GROUP"
-
-#define DSET_COMPACT        "DSET_COMPACT"
-#define DSET_CONTIGUOUS        "DSET_CONTIGUOUS"
-
-#define DSET_EA            "DSET_EA"
-#define DSET_NDATA_EA        "DSET_NDATA_EA"
+#define NON_V3_FILE    "h5fc_non_v3.h5"
+#define EDGE_V3_FILE   "h5fc_edge_v3.h5"
+#define ERR_LEVEL_FILE "h5fc_err_level.h5"
+
+const char *FILENAME[] = {"h5fc_ext1_i.h5",   /* 0 */
+                          "h5fc_ext1_s.h5",   /* 1 */
+                          "h5fc_ext1_f.h5",   /* 2 */
+                          "h5fc_ext2_is.h5",  /* 3 */
+                          "h5fc_ext2_if.h5",  /* 4 */
+                          "h5fc_ext2_sf.h5",  /* 5 */
+                          "h5fc_ext3_isf.h5", /* 6 */
+                          "h5fc_ext_none.h5", /* 7 */
+                          NULL};
+
+#define GROUP "GROUP"
+
+#define DSET_COMPACT    "DSET_COMPACT"
+#define DSET_CONTIGUOUS "DSET_CONTIGUOUS"
+
+#define DSET_EA         "DSET_EA"
+#define DSET_NDATA_EA   "DSET_NDATA_EA"
 #define DSET_BT2        "DSET_BT2"
-#define DSET_NDATA_BT2        "DSET_NDATA_BT2"
-#define DSET_FA            "DSET_FA"
-#define DSET_NDATA_FA        "DSET_NDATA_FA"
-#define DSET_NONE        "DSET_NONE"
-#define DSET_NDATA_NONE        "DSET_NDATA_NONE"
+#define DSET_NDATA_BT2  "DSET_NDATA_BT2"
+#define DSET_FA         "DSET_FA"
+#define DSET_NDATA_FA   "DSET_NDATA_FA"
+#define DSET_NONE       "DSET_NONE"
+#define DSET_NDATA_NONE "DSET_NDATA_NONE"
 
-#define DSET_EDGE        "DSET_EDGE"
-#define DSET_ERR        "DSET_ERR"
+#define DSET_EDGE "DSET_EDGE"
+#define DSET_ERR  "DSET_ERR"
 
 #define ISTORE_IK  64
 #define ISTORE_ERR 1
 
 #define NUM 500
 
-
 /*
  * Function: gen_non()
  *
@@ -77,42 +74,42 @@ const char *FILENAME[] = {
 static void
 gen_non(const char *fname)
 {
-    hid_t    fid = H5I_INVALID_HID;        /* file id */
-    hid_t    fcpl = H5I_INVALID_HID;        /* file creation property list */
-    hid_t    gid = H5I_INVALID_HID;        /* group id */
-    hid_t       sid = H5I_INVALID_HID;           /* space id */
-    hid_t    dcpl = H5I_INVALID_HID;        /* dataset creation property id */
-    hid_t    did1 = -1, did2 = H5I_INVALID_HID;    /* dataset id */
-    hsize_t     dims1[1] = {10};         /* dataset dimension */
-    hsize_t     dims2[2] = {4, 6};         /* dataset dimension */
-    hsize_t    max_dims[2];        /* maximum dataset dimension */
-    hsize_t     c_dims[2] = {2, 3};        /* chunk dimension */
-    int        i;                /* local index variable */
-    int         buf[24];                /* data buffer */
+    hid_t   fid  = H5I_INVALID_HID;            /* file id */
+    hid_t   fcpl = H5I_INVALID_HID;            /* file creation property list */
+    hid_t   gid  = H5I_INVALID_HID;            /* group id */
+    hid_t   sid  = H5I_INVALID_HID;            /* space id */
+    hid_t   dcpl = H5I_INVALID_HID;            /* dataset creation property id */
+    hid_t   did1 = -1, did2 = H5I_INVALID_HID; /* dataset id */
+    hsize_t dims1[1] = {10};                   /* dataset dimension */
+    hsize_t dims2[2] = {4, 6};                 /* dataset dimension */
+    hsize_t max_dims[2];                       /* maximum dataset dimension */
+    hsize_t c_dims[2] = {2, 3};                /* chunk dimension */
+    int     i;                                 /* local index variable */
+    int     buf[24];                           /* data buffer */
 
-    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         goto error;
-    if(H5Pset_shared_mesg_nindexes(fcpl, 4) < 0)
+    if (H5Pset_shared_mesg_nindexes(fcpl, 4) < 0)
         goto error;
-    if(H5Pset_istore_k(fcpl, 64) < 0)
+    if (H5Pset_istore_k(fcpl, 64) < 0)
         goto error;
 
     /* Create an empty file with latest-format */
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC|H5F_ACC_SWMR_WRITE, fcpl, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC | H5F_ACC_SWMR_WRITE, fcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Create a group */
-    if((gid = H5Gcreate2(fid, GROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid, GROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Create data */
-    for(i = 0; i < 24; i++)
+    for (i = 0; i < 24; i++)
         buf[i] = i;
 
     /* Set chunk */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_chunk(dcpl, 2, c_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, c_dims) < 0)
         goto error;
 
     /*
@@ -122,17 +119,17 @@ gen_non(const char *fname)
     /* Create dataspace */
     max_dims[0] = 10;
     max_dims[1] = H5S_UNLIMITED;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did1  = H5Dcreate2(fid, DSET_NDATA_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(fid, DSET_NDATA_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
 
     /*
@@ -143,35 +140,35 @@ gen_non(const char *fname)
     max_dims[0] = 10;
     max_dims[0] = H5S_UNLIMITED;
     max_dims[1] = H5S_UNLIMITED;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did1  = H5Dcreate2(gid, DSET_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(gid, DSET_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Write to the dataset */
-    if(H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto error;
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
     /* Re-open the file with old format */
-    if((fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Open the group */
-    if((gid = H5Gopen2(fid, GROUP, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(fid, GROUP, H5P_DEFAULT)) < 0)
         goto error;
 
     /*
@@ -179,23 +176,23 @@ gen_non(const char *fname)
      */
 
     /* Set chunk */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_chunk(dcpl, 2, c_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, c_dims) < 0)
         goto error;
 
     /* Create dataspace */
     max_dims[0] = H5S_UNLIMITED;
     max_dims[1] = H5S_UNLIMITED;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did1 = H5Dcreate2(fid, DSET_NDATA_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(fid, DSET_NDATA_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Close the dataspace */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
 
     /*
@@ -205,25 +202,25 @@ gen_non(const char *fname)
     /* Create dataspace */
     max_dims[0] = 10;
     max_dims[1] = H5S_UNLIMITED;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did2 = H5Dcreate2(gid, DSET_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did2 = H5Dcreate2(gid, DSET_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Write to the dataset */
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Dclose(did2) < 0)
+    if (H5Dclose(did2) < 0)
         goto error;
 
     /*
@@ -231,61 +228,64 @@ gen_non(const char *fname)
      */
 
     /* Create dataspace */
-    if((sid = H5Screate_simple(1, dims1, NULL)) < 0)
+    if ((sid = H5Screate_simple(1, dims1, NULL)) < 0)
         goto error;
 
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_layout(dcpl, H5D_COMPACT) < 0)
+    if (H5Pset_layout(dcpl, H5D_COMPACT) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did1  = H5Dcreate2(gid, DSET_COMPACT, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(gid, DSET_COMPACT, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
+        0)
         goto error;
 
     /* Closing */
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
 
     /*
      * Create a contiguous dataset with (2d with data) in the file
      */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_layout(dcpl, H5D_CONTIGUOUS) < 0)
+    if (H5Pset_layout(dcpl, H5D_CONTIGUOUS) < 0)
         goto error;
 
-    if((sid = H5Screate_simple(2, dims2, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, NULL)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did2  = H5Dcreate2(fid, DSET_CONTIGUOUS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did2 = H5Dcreate2(fid, DSET_CONTIGUOUS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT,
+                           H5P_DEFAULT)) < 0)
         goto error;
     /* Write to the dataset */
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Dclose(did2) < 0)
+    if (H5Dclose(did2) < 0)
         goto error;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
 
-    if(H5Gclose(gid) < 0)
-    goto error;
-    if(H5Pclose(fcpl) < 0)
-    goto error;
-    if(H5Fclose(fid) < 0)
+    if (H5Gclose(gid) < 0)
+        goto error;
+    if (H5Pclose(fcpl) < 0)
+        goto error;
+    if (H5Fclose(fid) < 0)
         goto error;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Sclose(sid);
         H5Dclose(did1);
@@ -293,7 +293,8 @@ error:
         H5Gclose(gid);
         H5Fclose(fcpl);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
 } /* gen_non() */
 
@@ -307,75 +308,76 @@ error:
 static void
 gen_edge(const char *fname)
 {
-    hid_t    fid = H5I_INVALID_HID;            /* file id */
-    hid_t    fapl = H5I_INVALID_HID;               /* file access property list */
-    hid_t       sid = H5I_INVALID_HID;           /* dataspace id */
-    hid_t    dcpl = H5I_INVALID_HID;            /* dataset creation property id */
-    hid_t    did = H5I_INVALID_HID;        /* dataset id */
-    hsize_t     dims2[2] = {12, 6};    /* Dataset dimensions */
-    hsize_t     c_dims[2] = {5, 5};    /* Chunk dimensions */
-    float     buf[12][6];                /* Buffer for writing data */
-    int        i, j;                /* local index variable */
+    hid_t   fid       = H5I_INVALID_HID; /* file id */
+    hid_t   fapl      = H5I_INVALID_HID; /* file access property list */
+    hid_t   sid       = H5I_INVALID_HID; /* dataspace id */
+    hid_t   dcpl      = H5I_INVALID_HID; /* dataset creation property id */
+    hid_t   did       = H5I_INVALID_HID; /* dataset id */
+    hsize_t dims2[2]  = {12, 6};         /* Dataset dimensions */
+    hsize_t c_dims[2] = {5, 5};          /* Chunk dimensions */
+    float   buf[12][6];                  /* Buffer for writing data */
+    int     i, j;                        /* local index variable */
 
     /* Create a new format file */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         goto error;
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         goto error;
 
     /* Set chunk, filter, no-filter-edge-chunk */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_chunk(dcpl, 2, c_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, c_dims) < 0)
         goto error;
-    if(H5Pset_deflate(dcpl, 9) < 0)
+    if (H5Pset_deflate(dcpl, 9) < 0)
         goto error;
-    if(H5Pset_chunk_opts(dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0)
+    if (H5Pset_chunk_opts(dcpl, H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS) < 0)
         goto error;
 
     /* Create dataspace */
-    if((sid = H5Screate_simple(2, dims2, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, NULL)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did = H5Dcreate2(fid, DSET_EDGE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, DSET_EDGE, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Create data */
-    for (i = 0; i< 12; i++)
-        for (j = 0; j< 6; j++)
+    for (i = 0; i < 12; i++)
+        for (j = 0; j < 6; j++)
             buf[i][j] = 100.0F;
 
     /* Write to the dataset */
-    if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto error;
-    if(H5Pclose(fapl) < 0)
+    if (H5Pclose(fapl) < 0)
         goto error;
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Sclose(sid);
         H5Dclose(did);
         H5Fclose(fid);
         H5Pclose(fapl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
 } /* gen_edge() */
 
-
 /*
  * Function: gen_err_level()
  *
@@ -395,30 +397,30 @@ error:
 static void
 gen_err_level(const char *fname)
 {
-    hid_t fid = H5I_INVALID_HID;            /* file ID */
-    hid_t fapl = H5I_INVALID_HID;               /* file access property list */
-    hid_t fcpl = H5I_INVALID_HID;               /* file creation property list */
-    hid_t sid = H5I_INVALID_HID;           /* dataspace id */
-    hid_t dcpl = H5I_INVALID_HID;        /* dataset creation property list */
-    hid_t did = H5I_INVALID_HID;        /* dataset ID */
-    hid_t fsid = H5I_INVALID_HID;        /* file dataspace ID */
-    hid_t msid = H5I_INVALID_HID;        /* memory dataspace ID */
-    unsigned char *buf = NULL;    /* buffer for data */
-    hsize_t dims[2] = {0, 1};            /* dataset dimension sizes */
-    hsize_t max_dims[2] = {1, H5S_UNLIMITED};    /* dataset maximum dimension sizes */
-    hsize_t chunk_dims[2] = {1, 1};        /* chunk dimension sizes */
-    int    n = 0;            /* local index variable */
+    hid_t          fid           = H5I_INVALID_HID;    /* file ID */
+    hid_t          fapl          = H5I_INVALID_HID;    /* file access property list */
+    hid_t          fcpl          = H5I_INVALID_HID;    /* file creation property list */
+    hid_t          sid           = H5I_INVALID_HID;    /* dataspace id */
+    hid_t          dcpl          = H5I_INVALID_HID;    /* dataset creation property list */
+    hid_t          did           = H5I_INVALID_HID;    /* dataset ID */
+    hid_t          fsid          = H5I_INVALID_HID;    /* file dataspace ID */
+    hid_t          msid          = H5I_INVALID_HID;    /* memory dataspace ID */
+    unsigned char *buf           = NULL;               /* buffer for data */
+    hsize_t        dims[2]       = {0, 1};             /* dataset dimension sizes */
+    hsize_t        max_dims[2]   = {1, H5S_UNLIMITED}; /* dataset maximum dimension sizes */
+    hsize_t        chunk_dims[2] = {1, 1};             /* chunk dimension sizes */
+    int            n             = 0;                  /* local index variable */
 
     /* Create a new format file */
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         goto error;
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         goto error;
 
     /* Set 'K' value to 1 in file creation property list */
-    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         goto error;
-    if(H5Pset_istore_k(fcpl, ISTORE_ERR) < 0)
+    if (H5Pset_istore_k(fcpl, ISTORE_ERR) < 0)
         goto error;
 
     /* Initialize data buffer */
@@ -426,87 +428,88 @@ gen_err_level(const char *fname)
     HDmemset(buf, 42, NUM * sizeof(unsigned char));
 
     /* Create the test file */
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+    if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
         goto error;
 
     /* Create a chunked dataset with extensible array chunk index */
-    if((sid = H5Screate_simple(2, dims, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims, max_dims)) < 0)
         goto error;
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, chunk_dims) < 0)
         goto error;
-    if((did = H5Dcreate2(fid, DSET_ERR, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, DSET_ERR, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Closing */
-    if(H5Pclose(fcpl) < 0)
+    if (H5Pclose(fcpl) < 0)
         goto error;
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         goto error;
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
     /* Re-open the file */
-    if((fid = H5Fopen(fname, H5F_ACC_RDWR, fapl)) < 0)
+    if ((fid = H5Fopen(fname, H5F_ACC_RDWR, fapl)) < 0)
         goto error;
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, DSET_ERR, H5P_DEFAULT)) < 0)
+    if ((did = H5Dopen2(fid, DSET_ERR, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Loop through appending 1 element at a time */
-    for(n = 0; n < NUM; n++) {
-    hsize_t start[2] = {0, 0};
-    hsize_t count[2] = {1, 1};
-    hsize_t extent[2] = {0, 0};
+    for (n = 0; n < NUM; n++) {
+        hsize_t start[2]  = {0, 0};
+        hsize_t count[2]  = {1, 1};
+        hsize_t extent[2] = {0, 0};
+
+        start[0]  = 0;
+        start[1]  = (hsize_t)n;
+        extent[0] = 1;
+        extent[1] = (hsize_t)(n + 1);
+
+        /* Set current dimension sizes for the dataset */
+        if (H5Dset_extent(did, extent) < 0)
+            goto error;
 
-    start[0] = 0;
-    start[1] = (hsize_t)n;
-    extent[0] = 1;
-    extent[1] = (hsize_t)(n + 1);
+        /* Set up memory dataspace */
+        if ((msid = H5Screate_simple(2, count, NULL)) < 0)
+            goto error;
 
-    /* Set current dimension sizes for the dataset */
-    if(H5Dset_extent(did, extent) < 0)
-        goto error;
+        /* Get file dataspace */
+        if ((fsid = H5Dget_space(did)) < 0)
+            goto error;
 
-    /* Set up memory dataspace */
-    if((msid = H5Screate_simple(2, count, NULL)) < 0)
-        goto error;
+        if ((H5Sselect_hyperslab(fsid, H5S_SELECT_SET, start, NULL, count, NULL)) < 0)
+            goto error;
 
-    /* Get file dataspace */
-    if((fsid = H5Dget_space(did)) < 0)
-        goto error;
+        /* Write to the dataset */
+        if (H5Dwrite(did, H5T_NATIVE_UCHAR, msid, fsid, H5P_DEFAULT, buf) < 0)
+            goto error;
 
-    if((H5Sselect_hyperslab(fsid, H5S_SELECT_SET, start, NULL, count, NULL)) < 0)
-        goto error;
+        if (H5Sclose(fsid) < 0)
+            goto error;
+        if (H5Sclose(msid) < 0)
+            goto error;
+    }
 
-    /* Write to the dataset */
-    if(H5Dwrite(did, H5T_NATIVE_UCHAR, msid, fsid, H5P_DEFAULT, buf) < 0)
+    /* Closing */
+    if (H5Dclose(did) < 0)
         goto error;
-
-    if(H5Sclose(fsid) < 0)
+    if (H5Fclose(fid) < 0)
         goto error;
-    if(H5Sclose(msid) < 0)
+    if (H5Pclose(fapl) < 0)
         goto error;
-    }
-
-    /* Closing */
-    if(H5Dclose(did) < 0)
-    goto error;
-    if(H5Fclose(fid) < 0)
-    goto error;
-    if(H5Pclose(fapl) < 0)
-    goto error;
 
 error:
-    if(buf)
+    if (buf)
         free(buf);
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Sclose(sid);
         H5Dclose(did);
@@ -515,7 +518,8 @@ error:
         H5Fclose(fid);
         H5Pclose(fapl);
         H5Pclose(fcpl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
 } /* gen_err_level() */
 
@@ -534,26 +538,26 @@ error:
 static void
 gen_ext(const char *fname, unsigned new_format, unsigned what)
 {
-    hid_t    fid = H5I_INVALID_HID;         /* file id */
-    hid_t    fapl = H5I_INVALID_HID;               /* file access property list */
-    hid_t    fcpl = H5I_INVALID_HID;               /* file creation property list */
-    hid_t    gid = H5I_INVALID_HID;               /* group id */
-    hid_t       sid = H5I_INVALID_HID;           /* space id */
-    hid_t    dcpl = H5I_INVALID_HID;            /* dataset creation property id */
-    hid_t    did1 = H5I_INVALID_HID, did2 = H5I_INVALID_HID;    /* dataset id */
-    hsize_t     dims1[1] = {10};         /* dataset dimension */
-    hsize_t     dims2[2] = {4, 6};         /* dataset dimension */
-    hsize_t    max_dims[2];        /* maximum dataset dimension */
-    hsize_t     c_dims[2] = {2, 3};        /* chunk dimension */
-    int        i;                /* local index variable */
-    int         buf[24];                /* data buffer */
-
-    if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-        goto error;
-
-    if(new_format) {
+    hid_t   fid  = H5I_INVALID_HID;                         /* file id */
+    hid_t   fapl = H5I_INVALID_HID;                         /* file access property list */
+    hid_t   fcpl = H5I_INVALID_HID;                         /* file creation property list */
+    hid_t   gid  = H5I_INVALID_HID;                         /* group id */
+    hid_t   sid  = H5I_INVALID_HID;                         /* space id */
+    hid_t   dcpl = H5I_INVALID_HID;                         /* dataset creation property id */
+    hid_t   did1 = H5I_INVALID_HID, did2 = H5I_INVALID_HID; /* dataset id */
+    hsize_t dims1[1] = {10};                                /* dataset dimension */
+    hsize_t dims2[2] = {4, 6};                              /* dataset dimension */
+    hsize_t max_dims[2];                                    /* maximum dataset dimension */
+    hsize_t c_dims[2] = {2, 3};                             /* chunk dimension */
+    int     i;                                              /* local index variable */
+    int     buf[24];                                        /* data buffer */
+
+    if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+        goto error;
+
+    if (new_format) {
         /* Create a new format file */
-        if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+        if (H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
             goto error;
     } /* end if */
 
@@ -561,68 +565,68 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
     fcpl = H5Pcreate(H5P_FILE_CREATE);
 
     /* Generate messages that might be placed in superblock extension */
-    switch(what) {
-    case 0:
-        H5Pset_istore_k(fcpl, ISTORE_IK);
-        break;
-    case 1:
-        H5Pset_shared_mesg_nindexes(fcpl, 4);
-        break;
-    case 2:
-        H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1);
-        break;
-    case 3:
-        H5Pset_istore_k(fcpl, ISTORE_IK);
-        H5Pset_shared_mesg_nindexes(fcpl, 4);
-        break;
-    case 4:
-        H5Pset_istore_k(fcpl, ISTORE_IK);
-        H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1);
-        break;
-    case 5:
-        H5Pset_shared_mesg_nindexes(fcpl, 4);
-        H5Pset_file_space_page_size(fcpl, (hsize_t)512);
-        break;
-    case 6:
-        H5Pset_istore_k(fcpl, ISTORE_IK);
-        H5Pset_shared_mesg_nindexes(fcpl, 4);
-        H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1);
-        break;
-    default:
-        break;
+    switch (what) {
+        case 0:
+            H5Pset_istore_k(fcpl, ISTORE_IK);
+            break;
+        case 1:
+            H5Pset_shared_mesg_nindexes(fcpl, 4);
+            break;
+        case 2:
+            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1);
+            break;
+        case 3:
+            H5Pset_istore_k(fcpl, ISTORE_IK);
+            H5Pset_shared_mesg_nindexes(fcpl, 4);
+            break;
+        case 4:
+            H5Pset_istore_k(fcpl, ISTORE_IK);
+            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1);
+            break;
+        case 5:
+            H5Pset_shared_mesg_nindexes(fcpl, 4);
+            H5Pset_file_space_page_size(fcpl, (hsize_t)512);
+            break;
+        case 6:
+            H5Pset_istore_k(fcpl, ISTORE_IK);
+            H5Pset_shared_mesg_nindexes(fcpl, 4);
+            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1);
+            break;
+        default:
+            break;
     }
 
     /* Create the file */
-    if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
+    if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
         goto error;
 
     /* Create a group */
-    if((gid = H5Gcreate2(fid, GROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid, GROUP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Set chunk */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         goto error;
-    if(H5Pset_chunk(dcpl, 2, c_dims) < 0)
+    if (H5Pset_chunk(dcpl, 2, c_dims) < 0)
         goto error;
 
-
     /*
      * Create a contiguous dataset
      */
 
     /* Create dataspace */
-    if((sid = H5Screate_simple(1, dims1, NULL)) < 0)
+    if ((sid = H5Screate_simple(1, dims1, NULL)) < 0)
         goto error;
 
     /* Create the dataset */
-    if((did1  = H5Dcreate2(fid, DSET_CONTIGUOUS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(fid, DSET_CONTIGUOUS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT,
+                           H5P_DEFAULT)) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
 
     /*
@@ -633,33 +637,32 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
     /* Create dataspace */
     max_dims[0] = 10;
     max_dims[1] = H5S_UNLIMITED;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the 2 datasets */
-    if((did1  = H5Dcreate2(gid, DSET_NDATA_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(gid, DSET_NDATA_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
-    if((did2  = H5Dcreate2(fid, DSET_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did2 = H5Dcreate2(fid, DSET_EA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Create data */
-    for(i = 0; i < 24; i++)
+    for (i = 0; i < 24; i++)
         buf[i] = i;
 
     /* Write to one dataset */
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Dclose(did2) < 0)
+    if (H5Dclose(did2) < 0)
         goto error;
 
-
     /*
      * Create 2 chunked datasets with version 2 B-tree chunk indexing type
      * (one with data; one without data)
@@ -669,26 +672,26 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
     max_dims[0] = 10;
     max_dims[0] = H5S_UNLIMITED;
     max_dims[1] = H5S_UNLIMITED;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the 2 datasets */
-    if((did1  = H5Dcreate2(fid, DSET_NDATA_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(fid, DSET_NDATA_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
-    if((did2  = H5Dcreate2(gid, DSET_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did2 = H5Dcreate2(gid, DSET_BT2, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Write to one dataset */
-    if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Dclose(did2) < 0)
+    if (H5Dclose(did2) < 0)
         goto error;
 
     /*
@@ -699,70 +702,70 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
     /* Create dataspace */
     max_dims[0] = 20;
     max_dims[1] = 10;
-    if((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
         goto error;
 
     /* Create the datasets */
-    if((did1  = H5Dcreate2(fid, DSET_FA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(fid, DSET_FA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
-    if((did2  = H5Dcreate2(gid, DSET_NDATA_FA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did2 = H5Dcreate2(gid, DSET_NDATA_FA, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Write to the dataset */
-    if(H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Dclose(did2) < 0)
+    if (H5Dclose(did2) < 0)
         goto error;
 
-
     /*
      * Create 2 chunked datasets with implicit chunk indexing type
      * (one with data; one without data)
      */
 
     /* Create dataspace */
-    if((sid = H5Screate_simple(2, dims2, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dims2, NULL)) < 0)
         goto error;
 
     /* Set early allocation */
-    if(H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
+    if (H5Pset_alloc_time(dcpl, H5D_ALLOC_TIME_EARLY) < 0)
         goto error;
 
     /* Create the 2 datasets */
-    if((did1  = H5Dcreate2(fid, DSET_NONE, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did1 = H5Dcreate2(fid, DSET_NONE, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
-    if((did2  = H5Dcreate2(gid, DSET_NDATA_NONE, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((did2 = H5Dcreate2(gid, DSET_NDATA_NONE, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         goto error;
 
     /* Write to one dataset */
-    if(H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+    if (H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
         goto error;
 
     /* Closing */
-    if(H5Dclose(did1) < 0)
+    if (H5Dclose(did1) < 0)
         goto error;
-    if(H5Dclose(did2) < 0)
+    if (H5Dclose(did2) < 0)
         goto error;
-    if(H5Sclose(sid) < 0)
+    if (H5Sclose(sid) < 0)
         goto error;
 
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         goto error;
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         goto error;
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         goto error;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Sclose(sid);
         H5Dclose(did1);
@@ -771,7 +774,8 @@ error:
         H5Fclose(fid);
         H5Pclose(fapl);
         H5Pclose(fcpl);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
 } /* end gen_ext() */
 
@@ -790,19 +794,18 @@ main(void)
     gen_err_level(ERR_LEVEL_FILE);
 
     /* Generate old/new format file with/without messages in the superblock extension */
-    for(new_format = FALSE; new_format <= TRUE; new_format++) {
-        for(i = 0; i < 8; i++) {
+    for (new_format = FALSE; new_format <= TRUE; new_format++) {
+        for (i = 0; i < 8; i++) {
             char filename[50];
 
             HDmemset(filename, 0, sizeof(filename));
-            if(!new_format)
+            if (!new_format)
                 HDstrcat(filename, "old_");
             HDstrcat(filename, FILENAME[i]);
 
             gen_ext(filename, new_format, i);
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
     return 0;
 } /* end main */
-