Clang-format of source files

1 files changed, 289 insertions, 271 deletions

diff --git a/test/titerate.c b/test/titerate.c
index 9d60915..bcf19b9 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -12,17 +12,17 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /***********************************************************
-*
-* Test program:     titerate
-*
-* Test the Group & Attribute functionality
-*
-*************************************************************/
+ *
+ * Test program:     titerate
+ *
+ * Test the Group & Attribute functionality
+ *
+ *************************************************************/
 
 #include "testhdf5.h"
 #include "H5srcdir.h"
 
-#define DATAFILE   "titerate.h5"
+#define DATAFILE "titerate.h5"
 
 /* Number of datasets for group iteration test */
 #define NDATASETS 50
@@ -34,29 +34,24 @@
 #define ITER_NGROUPS 150
 
 /* General maximum length of names used */
-#define NAMELEN     80
+#define NAMELEN 80
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_RANK    1
-#define SPACE1_DIM1    4
+#define SPACE1_RANK 1
+#define SPACE1_DIM1 4
 
-typedef enum {
-    RET_ZERO,
-    RET_TWO,
-    RET_CHANGE,
-    RET_CHANGE2
-} iter_enum;
+typedef enum { RET_ZERO, RET_TWO, RET_CHANGE, RET_CHANGE2 } iter_enum;
 
 /* Custom group iteration callback data */
 typedef struct {
-    char name[NAMELEN];     /* The name of the object */
-    H5O_type_t type;        /* The type of the object */
-    iter_enum command;      /* The type of return value */
+    char       name[NAMELEN]; /* The name of the object */
+    H5O_type_t type;          /* The type of the object */
+    iter_enum  command;       /* The type of return value */
 } iter_info;
 
 /* Definition for test_corrupted_attnamelen */
-#define CORRUPTED_ATNAMELEN_FILE   "memleak_H5O_dtype_decode_helper_H5Odtype.h5"
-#define DSET_NAME   "image"
+#define CORRUPTED_ATNAMELEN_FILE "memleak_H5O_dtype_decode_helper_H5Odtype.h5"
+#define DSET_NAME                "image"
 typedef struct searched_err_t {
     char message[256];
     bool found;
@@ -66,23 +61,21 @@ typedef struct searched_err_t {
 static int find_err_msg_cb(unsigned n, const H5E_error2_t *err_desc, void *_client_data);
 
 /* Local functions */
-int iter_strcmp(const void *s1, const void *s2);
-int iter_strcmp2(const void *s1, const void *s2);
-static herr_t liter_cb(hid_t group, const char *name, const H5L_info2_t *info,
-    void *op_data);
-static herr_t liter_cb2(hid_t group, const char *name, const H5L_info2_t *info,
-    void *op_data);
-herr_t aiter_cb(hid_t group, const char *name, const H5A_info_t *ainfo,
-    void *op_data);
+int           iter_strcmp(const void *s1, const void *s2);
+int           iter_strcmp2(const void *s1, const void *s2);
+static herr_t liter_cb(hid_t group, const char *name, const H5L_info2_t *info, void *op_data);
+static herr_t liter_cb2(hid_t group, const char *name, const H5L_info2_t *info, void *op_data);
+herr_t        aiter_cb(hid_t group, const char *name, const H5A_info_t *ainfo, void *op_data);
 
 /****************************************************************
 **
 **  iter_strcmp(): String comparison routine for qsort
 **
 ****************************************************************/
-H5_ATTR_PURE int iter_strcmp(const void *s1, const void *s2)
+H5_ATTR_PURE int
+iter_strcmp(const void *s1, const void *s2)
 {
-    return(HDstrcmp(*(const char * const *)s1,*(const char * const *)s2));
+    return (HDstrcmp(*(const char *const *)s1, *(const char *const *)s2));
 }
 
 /****************************************************************
@@ -92,32 +85,32 @@ H5_ATTR_PURE int iter_strcmp(const void *s1, const void *s2)
 ****************************************************************/
 static herr_t
 liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link_info,
-    void *op_data)
+         void *op_data)
 {
-    iter_info *info = (iter_info *)op_data;
-    static int count = 0;
+    iter_info *info   = (iter_info *)op_data;
+    static int count  = 0;
     static int count2 = 0;
 
     HDstrcpy(info->name, name);
 
-    switch(info->command) {
+    switch (info->command) {
         case RET_ZERO:
-            return(0);
+            return (0);
 
         case RET_TWO:
-            return(2);
+            return (2);
 
         case RET_CHANGE:
             count++;
-            return(count > 10 ? 1 : 0);
+            return (count > 10 ? 1 : 0);
 
         case RET_CHANGE2:
             count2++;
-            return(count2 > 10 ? 1 : 0);
+            return (count2 > 10 ? 1 : 0);
 
         default:
             HDprintf("invalid iteration command");
-            return(-1);
+            return (-1);
     } /* end switch */
 } /* end liter_cb() */
 
@@ -129,19 +122,19 @@ liter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t H5_ATTR
 static void
 test_iter_group(hid_t fapl, hbool_t new_format)
 {
-    hid_t file;             /* File ID */
-    hid_t dataset;          /* Dataset ID */
-    hid_t datatype;         /* Common datatype ID */
-    hid_t filespace;        /* Common dataspace ID */
-    hid_t root_group,grp;   /* Root group ID */
-    int i;                  /* counting variable */
-    hsize_t idx;            /* Index in the group */
-    char name[NAMELEN];     /* temporary name buffer */
-    char *lnames[NDATASETS + 2];/* Names of the links created */
-    char dataset_name[NAMELEN];  /* dataset name */
-    iter_info info;         /* Custom iteration information */
-    H5G_info_t ginfo;       /* Buffer for querying object's info */
-    herr_t ret;            /* Generic return value */
+    hid_t      file;                  /* File ID */
+    hid_t      dataset;               /* Dataset ID */
+    hid_t      datatype;              /* Common datatype ID */
+    hid_t      filespace;             /* Common dataspace ID */
+    hid_t      root_group, grp;       /* Root group ID */
+    int        i;                     /* counting variable */
+    hsize_t    idx;                   /* Index in the group */
+    char       name[NAMELEN];         /* temporary name buffer */
+    char *     lnames[NDATASETS + 2]; /* Names of the links created */
+    char       dataset_name[NAMELEN]; /* dataset name */
+    iter_info  info;                  /* Custom iteration information */
+    H5G_info_t ginfo;                 /* Buffer for querying object's info */
+    herr_t     ret;                   /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Group Iteration Functionality\n"));
@@ -152,18 +145,18 @@ test_iter_group(hid_t fapl, hbool_t new_format)
 
     /* Test iterating over empty group */
     info.command = RET_ZERO;
-    idx = 0;
-    ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
+    idx          = 0;
+    ret          = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
     VERIFY(ret, SUCCEED, "H5Literate2");
 
     datatype = H5Tcopy(H5T_NATIVE_INT);
     CHECK(datatype, FAIL, "H5Tcopy");
 
-    filespace=H5Screate(H5S_SCALAR);
+    filespace = H5Screate(H5S_SCALAR);
     CHECK(filespace, FAIL, "H5Screate");
 
-    for(i=0; i< NDATASETS; i++) {
-        HDsprintf(name,"Dataset %d",i);
+    for (i = 0; i < NDATASETS; i++) {
+        HDsprintf(name, "Dataset %d", i);
         dataset = H5Dcreate2(file, name, datatype, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(dataset, FAIL, "H5Dcreate2");
 
@@ -204,7 +197,6 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     /* Sort the dataset names */
     HDqsort(lnames, (size_t)(NDATASETS + 2), sizeof(char *), iter_strcmp);
 
-
     /* Iterate through the datasets in the root group in various ways */
     file = H5Fopen(DATAFILE, H5F_ACC_RDONLY, fapl);
     CHECK(file, FAIL, "H5Fopen");
@@ -219,19 +211,25 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     CHECK(ret, FAIL, "H5Gget_info");
     VERIFY(ginfo.nlinks, (NDATASETS + 2), "H5Gget_info");
 
-    for(i = 0; i< (int)ginfo.nlinks; i++) {
-        H5O_info2_t oinfo;               /* Object info */
+    for (i = 0; i < (int)ginfo.nlinks; i++) {
+        H5O_info2_t oinfo; /* Object info */
 
-        ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
+        ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i,
+                                         dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Lget_name_by_idx");
 
-        ret = H5Oget_info_by_idx3(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+        ret = H5Oget_info_by_idx3(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo,
+                                  H5O_INFO_BASIC, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Oget_info_by_idx");
     } /* end for */
 
-    H5E_BEGIN_TRY {
-        ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS+3), dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        ret =
+            (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3),
+                                       dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Lget_name_by_idx");
 
     ret = H5Gclose(root_group);
@@ -245,55 +243,57 @@ test_iter_group(hid_t fapl, hbool_t new_format)
     CHECK(ret, FAIL, "H5Gget_info");
     VERIFY(ginfo.nlinks, NDATASETS + 2, "H5Gget_info");
 
-    for(i = 0; i< (int)ginfo.nlinks; i++) {
-        H5O_info2_t oinfo;               /* Object info */
+    for (i = 0; i < (int)ginfo.nlinks; i++) {
+        H5O_info2_t oinfo; /* Object info */
 
-        ret = (herr_t)H5Lget_name_by_idx(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
+        ret = (herr_t)H5Lget_name_by_idx(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, dataset_name,
+                                         (size_t)NAMELEN, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Lget_name_by_idx");
 
-        ret = H5Oget_info_by_idx3(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+        ret = H5Oget_info_by_idx3(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5O_INFO_BASIC,
+                                  H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Oget_info_by_idx3");
     } /* end for */
 
-    H5E_BEGIN_TRY {
-        ret = (herr_t)H5Lget_name_by_idx(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3), dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        ret = (herr_t)H5Lget_name_by_idx(file, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3),
+                                         dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Lget_name_by_idx");
 
     /* Test invalid indices for starting iteration */
     info.command = RET_ZERO;
-    idx = (hsize_t)-1;
-    H5E_BEGIN_TRY {
-        ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
-    } H5E_END_TRY;
+    idx          = (hsize_t)-1;
+    H5E_BEGIN_TRY { ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Literate2");
 
     /* Test skipping exactly as many entries as in the group */
     idx = NDATASETS + 2;
-    H5E_BEGIN_TRY {
-        ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Literate2");
 
     /* Test skipping more entries than are in the group */
     idx = NDATASETS + 3;
-    H5E_BEGIN_TRY {
-        ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info); }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Literate2");
 
     /* Test all objects in group, when callback always returns 0 */
     info.command = RET_ZERO;
-    idx = 0;
-    if((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0)
+    idx          = 0;
+    if ((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0)
         TestErrPrintf("Group iteration function didn't return zero correctly!\n");
 
     /* Test all objects in group, when callback always returns 1 */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = RET_TWO;
-    i = 0;
-    idx = 0;
-    while((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0) {
+    i            = 0;
+    idx          = 0;
+    while ((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) > 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 2, "H5Literate2");
 
@@ -302,24 +302,27 @@ test_iter_group(hid_t fapl, hbool_t new_format)
 
         /* Verify that the index is the correct value */
         VERIFY(idx, (hsize_t)i, "H5Literate2");
-        if(idx > (NDATASETS + 2))
+        if (idx > (NDATASETS + 2))
             TestErrPrintf("Group iteration function walked too far!\n");
 
         /* Verify that the correct name is retrieved */
-        if(HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0)
-            TestErrPrintf("Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n", (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]);
+        if (HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0)
+            TestErrPrintf(
+                "Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n",
+                (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]);
     } /* end while */
     VERIFY(ret, -1, "H5Literate2");
 
-    if(i != (NDATASETS + 2))
-        TestErrPrintf("%u: Group iteration function didn't perform multiple iterations correctly!\n", __LINE__);
+    if (i != (NDATASETS + 2))
+        TestErrPrintf("%u: Group iteration function didn't perform multiple iterations correctly!\n",
+                      __LINE__);
 
     /* Test all objects in group, when callback changes return value */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = new_format ? RET_CHANGE2 : RET_CHANGE;
-    i = 0;
-    idx = 0;
-    while((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) >= 0) {
+    i            = 0;
+    idx          = 0;
+    while ((ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb, &info)) >= 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 1, "H5Literate2");
 
@@ -328,23 +331,26 @@ test_iter_group(hid_t fapl, hbool_t new_format)
 
         /* Verify that the index is the correct value */
         VERIFY(idx, (hsize_t)(i + 10), "H5Literate2");
-        if(idx > (NDATASETS + 2))
+        if (idx > (NDATASETS + 2))
             TestErrPrintf("Group iteration function walked too far!\n");
 
         /* Verify that the correct name is retrieved */
-        if(HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0)
-            TestErrPrintf("Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n", (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]);
+        if (HDstrcmp(info.name, lnames[(size_t)(idx - 1)]) != 0)
+            TestErrPrintf(
+                "Group iteration function didn't return name correctly for link - lnames[%u] = '%s'!\n",
+                (unsigned)(idx - 1), lnames[(size_t)(idx - 1)]);
     } /* end while */
     VERIFY(ret, -1, "H5Literate2");
 
-    if(i != 42 || idx != 52)
-        TestErrPrintf("%u: Group iteration function didn't perform multiple iterations correctly!\n", __LINE__);
+    if (i != 42 || idx != 52)
+        TestErrPrintf("%u: Group iteration function didn't perform multiple iterations correctly!\n",
+                      __LINE__);
 
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free the dataset names */
-    for(i = 0; i< (NDATASETS + 2); i++)
+    for (i = 0; i < (NDATASETS + 2); i++)
         HDfree(lnames[i]);
 } /* test_iter_group() */
 
@@ -354,33 +360,32 @@ test_iter_group(hid_t fapl, hbool_t new_format)
 **
 ****************************************************************/
 herr_t
-aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_UNUSED *ainfo,
-    void *op_data)
+aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *op_data)
 {
-    iter_info *info = (iter_info *)op_data;
-    static int count = 0;
+    iter_info *info   = (iter_info *)op_data;
+    static int count  = 0;
     static int count2 = 0;
 
     HDstrcpy(info->name, name);
 
-    switch(info->command) {
+    switch (info->command) {
         case RET_ZERO:
-            return(0);
+            return (0);
 
         case RET_TWO:
-            return(2);
+            return (2);
 
         case RET_CHANGE:
             count++;
-            return(count > 10 ? 1 : 0);
+            return (count > 10 ? 1 : 0);
 
         case RET_CHANGE2:
             count2++;
-            return(count2 > 10 ? 1 : 0);
+            return (count2 > 10 ? 1 : 0);
 
         default:
             HDprintf("invalid iteration command");
-            return(-1);
+            return (-1);
     } /* end switch */
 } /* end aiter_cb() */
 
@@ -389,18 +394,19 @@ aiter_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5A_info_t H5_ATTR_
 **  test_iter_attr(): Test attribute iteration functionality
 **
 ****************************************************************/
-static void test_iter_attr(hid_t fapl, hbool_t new_format)
+static void
+test_iter_attr(hid_t fapl, hbool_t new_format)
 {
-    hid_t file;             /* File ID */
-    hid_t dataset;          /* Common Dataset ID */
-    hid_t filespace;        /* Common dataspace ID */
-    hid_t attribute;        /* Attribute ID */
-    int i;                  /* counting variable */
-    hsize_t idx;            /* Index in the attribute list */
-    char name[NAMELEN];     /* temporary name buffer */
-    char *anames[NATTR];    /* Names of the attributes created */
-    iter_info info;         /* Custom iteration information */
-    herr_t        ret;        /* Generic return value        */
+    hid_t     file;          /* File ID */
+    hid_t     dataset;       /* Common Dataset ID */
+    hid_t     filespace;     /* Common dataspace ID */
+    hid_t     attribute;     /* Attribute ID */
+    int       i;             /* counting variable */
+    hsize_t   idx;           /* Index in the attribute list */
+    char      name[NAMELEN]; /* temporary name buffer */
+    char *    anames[NATTR]; /* Names of the attributes created */
+    iter_info info;          /* Custom iteration information */
+    herr_t    ret;           /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Attribute Iteration Functionality\n"));
@@ -415,7 +421,7 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
     dataset = H5Dcreate2(file, "Dataset", H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate2");
 
-    for(i = 0; i < NATTR; i++) {
+    for (i = 0; i < NATTR; i++) {
         HDsprintf(name, "Attribute %02d", i);
         attribute = H5Acreate2(dataset, name, H5T_NATIVE_INT, filespace, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(attribute, FAIL, "H5Acreate2");
@@ -438,7 +444,6 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 
-
     /* Iterate through the attributes on the dataset in various ways */
     file = H5Fopen(DATAFILE, H5F_ACC_RDONLY, fapl);
     CHECK(file, FAIL, "H5Fopen");
@@ -451,30 +456,28 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
 
     /* Test skipping exactly as many attributes as there are */
     idx = NATTR;
-    H5E_BEGIN_TRY {
-        ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info); }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Aiterate2");
 
     /* Test skipping more attributes than there are */
     idx = NATTR + 1;
-    H5E_BEGIN_TRY {
-        ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info); }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Aiterate2");
 
     /* Test all attributes on dataset, when callback always returns 0 */
     info.command = RET_ZERO;
-    idx = 0;
-    if((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0)
+    idx          = 0;
+    if ((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0)
         TestErrPrintf("Attribute iteration function didn't return zero correctly!\n");
 
     /* Test all attributes on dataset, when callback always returns 1 */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = RET_TWO;
-    i = 0;
-    idx = 0;
-    while((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) {
+    i            = 0;
+    idx          = 0;
+    while ((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 2, "H5Aiterate2");
 
@@ -485,23 +488,25 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
         VERIFY(idx, (unsigned)i, "H5Aiterate2");
 
         /* Don't check name when new format is used */
-        if(!new_format) {
+        if (!new_format) {
             /* Verify that the correct name is retrieved */
-            if(HDstrcmp(info.name, anames[(size_t)idx - 1]) != 0)
-                TestErrPrintf("%u: Attribute iteration function didn't set names correctly, info.name = '%s', anames[%u] = '%s'!\n", __LINE__, info.name, (unsigned)(idx - 1), anames[(size_t)idx - 1]);
+            if (HDstrcmp(info.name, anames[(size_t)idx - 1]) != 0)
+                TestErrPrintf("%u: Attribute iteration function didn't set names correctly, info.name = "
+                              "'%s', anames[%u] = '%s'!\n",
+                              __LINE__, info.name, (unsigned)(idx - 1), anames[(size_t)idx - 1]);
         } /* end if */
-    } /* end while */
+    }     /* end while */
     VERIFY(ret, -1, "H5Aiterate2");
-    if(i != 50 || idx != 50)
-        TestErrPrintf("%u: Attribute iteration function didn't perform multiple iterations correctly!\n", __LINE__);
-
+    if (i != 50 || idx != 50)
+        TestErrPrintf("%u: Attribute iteration function didn't perform multiple iterations correctly!\n",
+                      __LINE__);
 
     /* Test all attributes on dataset, when callback changes return value */
     /* This also tests the "restarting" ability, because the index changes */
     info.command = new_format ? RET_CHANGE2 : RET_CHANGE;
-    i = 0;
-    idx = 0;
-    while((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) {
+    i            = 0;
+    idx          = 0;
+    while ((ret = H5Aiterate2(dataset, H5_INDEX_NAME, H5_ITER_INC, &idx, aiter_cb, &info)) > 0) {
         /* Verify return value from iterator gets propagated correctly */
         VERIFY(ret, 1, "H5Aiterate2");
 
@@ -512,24 +517,27 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
         VERIFY(idx, (unsigned)i + 10, "H5Aiterate2");
 
         /* Don't check name when new format is used */
-        if(!new_format) {
+        if (!new_format) {
             /* Verify that the correct name is retrieved */
-            if(HDstrcmp(info.name, anames[(size_t)idx - 1]) != 0)
-                TestErrPrintf("%u: Attribute iteration function didn't set names correctly, info.name = '%s', anames[%u] = '%s'!\n", __LINE__, info.name, (unsigned)(idx - 1), anames[(size_t)idx - 1]);
+            if (HDstrcmp(info.name, anames[(size_t)idx - 1]) != 0)
+                TestErrPrintf("%u: Attribute iteration function didn't set names correctly, info.name = "
+                              "'%s', anames[%u] = '%s'!\n",
+                              __LINE__, info.name, (unsigned)(idx - 1), anames[(size_t)idx - 1]);
         } /* end if */
-    } /* end while */
+    }     /* end while */
     VERIFY(ret, -1, "H5Aiterate2");
-    if(i != 40 || idx != 50)
-        TestErrPrintf("%u: Attribute iteration function didn't perform multiple iterations correctly!\n", __LINE__);
+    if (i != 40 || idx != 50)
+        TestErrPrintf("%u: Attribute iteration function didn't perform multiple iterations correctly!\n",
+                      __LINE__);
 
-    ret=H5Fclose(file);
+    ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 
-    ret=H5Dclose(dataset);
+    ret = H5Dclose(dataset);
     CHECK(ret, FAIL, "H5Dclose");
 
     /* Free the attribute names */
-    for(i=0; i< NATTR; i++)
+    for (i = 0; i < NATTR; i++)
         HDfree(anames[i]);
 
 } /* test_iter_attr() */
@@ -539,9 +547,10 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format)
 **  iter_strcmp2(): String comparison routine for qsort
 **
 ****************************************************************/
-H5_ATTR_PURE int iter_strcmp2(const void *s1, const void *s2)
+H5_ATTR_PURE int
+iter_strcmp2(const void *s1, const void *s2)
 {
-    return(HDstrcmp((const char *)s1, (const char *)s2));
+    return (HDstrcmp((const char *)s1, (const char *)s2));
 } /* end iter_strcmp2() */
 
 /****************************************************************
@@ -550,16 +559,15 @@ H5_ATTR_PURE int iter_strcmp2(const void *s1, const void *s2)
 **
 ****************************************************************/
 static herr_t
-liter_cb2(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link_info,
-    void *opdata)
+liter_cb2(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link_info, void *opdata)
 {
     const iter_info *test_info = (const iter_info *)opdata;
-    H5O_info2_t oinfo;
-    herr_t ret;        /* Generic return value        */
+    H5O_info2_t      oinfo;
+    herr_t           ret; /* Generic return value        */
 
-    if(HDstrcmp(name, test_info->name)) {
+    if (HDstrcmp(name, test_info->name)) {
         TestErrPrintf("name = '%s', test_info = '%s'\n", name, test_info->name);
-        return(H5_ITER_ERROR);
+        return (H5_ITER_ERROR);
     } /* end if */
 
     /*
@@ -568,12 +576,12 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link
     ret = H5Oget_info_by_name3(loc_id, name, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
     CHECK(ret, FAIL, "H5Oget_info_by_name3");
 
-    if(test_info->type != oinfo.type) {
+    if (test_info->type != oinfo.type) {
         TestErrPrintf("test_info->type = %d, oinfo.type = %d\n", test_info->type, (int)oinfo.type);
-        return(H5_ITER_ERROR);
+        return (H5_ITER_ERROR);
     } /* end if */
 
-    return(H5_ITER_STOP);
+    return (H5_ITER_STOP);
 } /* liter_cb2() */
 
 /****************************************************************
@@ -585,23 +593,23 @@ liter_cb2(hid_t loc_id, const char *name, const H5L_info2_t H5_ATTR_UNUSED *link
 static void
 test_iter_group_large(hid_t fapl)
 {
-    hid_t        file;        /* HDF5 File IDs        */
-    hid_t        dataset;    /* Dataset ID            */
-    hid_t        group;      /* Group ID             */
-    hid_t        sid;       /* Dataspace ID            */
-    hid_t        tid;       /* Datatype ID            */
-    hsize_t        dims[] = {SPACE1_DIM1};
-    herr_t        ret;        /* Generic return value        */
-    char gname[20];             /* Temporary group name */
-    iter_info *names;           /* Names of objects in the root group */
-    iter_info *curr_name;       /* Pointer to the current name in the root group */
-    int                 i;
+    hid_t      file;    /* HDF5 File IDs        */
+    hid_t      dataset; /* Dataset ID            */
+    hid_t      group;   /* Group ID             */
+    hid_t      sid;     /* Dataspace ID            */
+    hid_t      tid;     /* Datatype ID            */
+    hsize_t    dims[] = {SPACE1_DIM1};
+    herr_t     ret;       /* Generic return value        */
+    char       gname[20]; /* Temporary group name */
+    iter_info *names;     /* Names of objects in the root group */
+    iter_info *curr_name; /* Pointer to the current name in the root group */
+    int        i;
 
     /* Compound datatype */
     typedef struct s1_t {
         unsigned int a;
         unsigned int b;
-        float c;
+        float        c;
     } s1_t;
 
     /* Allocate & initialize array */
@@ -620,7 +628,7 @@ test_iter_group_large(hid_t fapl)
     CHECK(sid, FAIL, "H5Screate_simple");
 
     /* Create a bunch of groups */
-    for(i = 0; i < ITER_NGROUPS; i++) {
+    for (i = 0; i < ITER_NGROUPS; i++) {
         HDsprintf(gname, "Group_%d", i);
 
         /* Add the name to the list of objects in the root group */
@@ -683,13 +691,13 @@ test_iter_group_large(hid_t fapl)
 
     /* Iterate through the file to see members of the root group */
     curr_name = &names[0];
-    ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, NULL, liter_cb2, curr_name);
+    ret       = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, NULL, liter_cb2, curr_name);
     CHECK(ret, FAIL, "H5Literate2");
-    for(i = 1; i < 100; i++) {
+    for (i = 1; i < 100; i++) {
         hsize_t idx = (hsize_t)i;
 
         curr_name = &names[i];
-        ret = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb2, curr_name);
+        ret       = H5Literate2(file, H5_INDEX_NAME, H5_ITER_INC, &idx, liter_cb2, curr_name);
         CHECK(ret, FAIL, "H5Literate2");
     } /* end for */
 
@@ -707,21 +715,22 @@ test_iter_group_large(hid_t fapl)
 **                         functionality
 **
 ****************************************************************/
-static void test_grp_memb_funcs(hid_t fapl)
+static void
+test_grp_memb_funcs(hid_t fapl)
 {
-    hid_t file;             /* File ID */
-    hid_t dataset;          /* Dataset ID */
-    hid_t datatype;         /* Common datatype ID */
-    hid_t filespace;        /* Common dataspace ID */
-    hid_t root_group,grp;   /* Root group ID */
-    int i;                  /* counting variable */
-    char name[NAMELEN];     /* temporary name buffer */
-    char *dnames[NDATASETS+2];/* Names of the datasets created */
-    char *obj_names[NDATASETS+2];/* Names of the objects in group */
-    char dataset_name[NAMELEN];  /* dataset name */
-    ssize_t name_len;       /* Length of object's name */
-    H5G_info_t ginfo;       /* Buffer for querying object's info */
-    herr_t ret = SUCCEED;    /* Generic return value */
+    hid_t      file;                     /* File ID */
+    hid_t      dataset;                  /* Dataset ID */
+    hid_t      datatype;                 /* Common datatype ID */
+    hid_t      filespace;                /* Common dataspace ID */
+    hid_t      root_group, grp;          /* Root group ID */
+    int        i;                        /* counting variable */
+    char       name[NAMELEN];            /* temporary name buffer */
+    char *     dnames[NDATASETS + 2];    /* Names of the datasets created */
+    char *     obj_names[NDATASETS + 2]; /* Names of the objects in group */
+    char       dataset_name[NAMELEN];    /* dataset name */
+    ssize_t    name_len;                 /* Length of object's name */
+    H5G_info_t ginfo;                    /* Buffer for querying object's info */
+    herr_t     ret = SUCCEED;            /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Group Member Information Functionality\n"));
@@ -736,7 +745,7 @@ static void test_grp_memb_funcs(hid_t fapl)
     filespace = H5Screate(H5S_SCALAR);
     CHECK(filespace, FAIL, "H5Screate");
 
-    for(i = 0; i < NDATASETS; i++) {
+    for (i = 0; i < NDATASETS; i++) {
         HDsprintf(name, "Dataset %d", i);
         dataset = H5Dcreate2(file, name, datatype, filespace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         CHECK(dataset, FAIL, "H5Dcreate2");
@@ -792,14 +801,16 @@ static void test_grp_memb_funcs(hid_t fapl)
     CHECK(ret, FAIL, "H5Gget_info");
     VERIFY(ginfo.nlinks, (NDATASETS + 2), "H5Gget_info");
 
-    for(i = 0; i < (int)ginfo.nlinks; i++) {
-        H5O_info2_t oinfo;               /* Object info */
+    for (i = 0; i < (int)ginfo.nlinks; i++) {
+        H5O_info2_t oinfo; /* Object info */
 
         /* Test with NULL for name, to query length */
-        name_len = H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, NULL, (size_t)NAMELEN, H5P_DEFAULT);
+        name_len = H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, NULL,
+                                      (size_t)NAMELEN, H5P_DEFAULT);
         CHECK(name_len, FAIL, "H5Lget_name_by_idx");
 
-        ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, dataset_name, (size_t)(name_len + 1), H5P_DEFAULT);
+        ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i,
+                                         dataset_name, (size_t)(name_len + 1), H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Lget_name_by_idx");
 
         /* Double-check that the length is the same */
@@ -809,27 +820,32 @@ static void test_grp_memb_funcs(hid_t fapl)
         obj_names[i] = HDstrdup(dataset_name);
         CHECK_PTR(obj_names[i], "strdup");
 
-        ret = H5Oget_info_by_idx3(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+        ret = H5Oget_info_by_idx3(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo,
+                                  H5O_INFO_BASIC, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Oget_info_by_idx3");
 
-        if(!HDstrcmp(dataset_name, "grp"))
+        if (!HDstrcmp(dataset_name, "grp"))
             VERIFY(oinfo.type, H5O_TYPE_GROUP, "H5Lget_name_by_idx");
-        if(!HDstrcmp(dataset_name, "dtype"))
+        if (!HDstrcmp(dataset_name, "dtype"))
             VERIFY(oinfo.type, H5O_TYPE_NAMED_DATATYPE, "H5Lget_name_by_idx");
-        if(!HDstrncmp(dataset_name, "Dataset", (size_t)7))
+        if (!HDstrncmp(dataset_name, "Dataset", (size_t)7))
             VERIFY(oinfo.type, H5O_TYPE_DATASET, "H5Lget_name_by_idx");
     } /* end for */
 
-    H5E_BEGIN_TRY {
-        ret = (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS+3), dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        ret =
+            (herr_t)H5Lget_name_by_idx(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)(NDATASETS + 3),
+                                       dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Lget_name_by_idx");
 
     /* Sort the dataset names */
     HDqsort(obj_names, (size_t)(NDATASETS + 2), sizeof(char *), iter_strcmp);
 
     /* Compare object names */
-    for(i = 0; i< (int)ginfo.nlinks; i++) {
+    for (i = 0; i < (int)ginfo.nlinks; i++) {
         ret = HDstrcmp(dnames[i], obj_names[i]);
         VERIFY(ret, 0, "HDstrcmp");
     } /* end for */
@@ -837,12 +853,11 @@ static void test_grp_memb_funcs(hid_t fapl)
     ret = H5Gclose(root_group);
     CHECK(ret, FAIL, "H5Gclose");
 
-
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free the dataset names */
-    for(i = 0; i< (NDATASETS + 2); i++) {
+    for (i = 0; i < (NDATASETS + 2); i++) {
         HDfree(dnames[i]);
         HDfree(obj_names[i]);
     } /* end for */
@@ -853,15 +868,16 @@ static void test_grp_memb_funcs(hid_t fapl)
 **  test_links(): Test soft and hard link iteration
 **
 ****************************************************************/
-static void test_links(hid_t fapl)
+static void
+test_links(hid_t fapl)
 {
-    hid_t file;             /* File ID */
-    char obj_name[NAMELEN]; /* Names of the object in group */
-    ssize_t name_len;       /* Length of object's name */
-    hid_t    gid, gid1;
-    H5G_info_t ginfo;       /* Buffer for querying object's info */
-    hsize_t i;
-    herr_t ret;            /* Generic return value */
+    hid_t      file;              /* File ID */
+    char       obj_name[NAMELEN]; /* Names of the object in group */
+    ssize_t    name_len;          /* Length of object's name */
+    hid_t      gid, gid1;
+    H5G_info_t ginfo; /* Buffer for querying object's info */
+    hsize_t    i;
+    herr_t     ret; /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Soft and Hard Link Iteration Functionality\n"));
@@ -889,12 +905,13 @@ static void test_links(hid_t fapl)
     VERIFY(ginfo.nlinks, 3, "H5Gget_info");
 
     /* Test these two functions, H5Oget_info_by_idx and H5Lget_name_by_idx */
-    for(i = 0; i < ginfo.nlinks; i++) {
-        H5O_info2_t oinfo;              /* Object info */
-        H5L_info2_t linfo;              /* Link info */
+    for (i = 0; i < ginfo.nlinks; i++) {
+        H5O_info2_t oinfo; /* Object info */
+        H5L_info2_t linfo; /* Link info */
 
         /* Get link name */
-        name_len = H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, i, obj_name, (size_t)NAMELEN, H5P_DEFAULT);
+        name_len = H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, i, obj_name, (size_t)NAMELEN,
+                                      H5P_DEFAULT);
         CHECK(name_len, FAIL, "H5Lget_name_by_idx");
 
         /* Get link type */
@@ -902,16 +919,17 @@ static void test_links(hid_t fapl)
         CHECK(ret, FAIL, "H5Lget_info_by_idx2");
 
         /* Get object type */
-        if(linfo.type == H5L_TYPE_HARD) {
-            ret = H5Oget_info_by_idx3(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+        if (linfo.type == H5L_TYPE_HARD) {
+            ret = H5Oget_info_by_idx3(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo,
+                                      H5O_INFO_BASIC, H5P_DEFAULT);
             CHECK(ret, FAIL, "H5Oget_info_by_idx3");
         } /* end if */
 
-        if(!HDstrcmp(obj_name, "g1.1"))
+        if (!HDstrcmp(obj_name, "g1.1"))
             VERIFY(oinfo.type, H5O_TYPE_GROUP, "H5Lget_name_by_idx");
-        else if(!HDstrcmp(obj_name, "hardlink"))
+        else if (!HDstrcmp(obj_name, "hardlink"))
             VERIFY(oinfo.type, H5O_TYPE_GROUP, "H5Lget_name_by_idx");
-        else if(!HDstrcmp(obj_name, "softlink"))
+        else if (!HDstrcmp(obj_name, "softlink"))
             VERIFY(linfo.type, H5L_TYPE_SOFT, "H5Lget_name_by_idx");
         else
             CHECK(0, 0, "unknown object name");
@@ -941,17 +959,16 @@ static void test_links(hid_t fapl)
 static int
 find_err_msg_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *_client_data)
 {
-    int status = H5_ITER_CONT;
+    int             status       = H5_ITER_CONT;
     searched_err_t *searched_err = (searched_err_t *)_client_data;
 
     if (searched_err == NULL)
         return H5_ITER_ERROR;
 
     /* If the searched error message is found, stop the iteration */
-    if (err_desc->desc != NULL && strcmp(err_desc->desc, searched_err->message) == 0)
-    {
+    if (err_desc->desc != NULL && strcmp(err_desc->desc, searched_err->message) == 0) {
         searched_err->found = true;
-        status = H5_ITER_STOP;
+        status              = H5_ITER_STOP;
     }
 
     return status;
@@ -964,17 +981,18 @@ find_err_msg_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *_
 **                      detected and invalid read can be avoided.
 **
 **************************************************************************/
-static void test_corrupted_attnamelen(void)
+static void
+test_corrupted_attnamelen(void)
 {
-    hid_t          fid = -1;            /* File ID */
-    hid_t          did = -1;            /* Dataset ID */
-    searched_err_t err_caught;          /* Data to be passed to callback func */
-    int            err_status;          /* Status returned by H5Aiterate2 */
-    herr_t         ret;                 /* Return value */
-    const char *testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */
+    hid_t          fid = -1;   /* File ID */
+    hid_t          did = -1;   /* Dataset ID */
+    searched_err_t err_caught; /* Data to be passed to callback func */
+    int            err_status; /* Status returned by H5Aiterate2 */
+    herr_t         ret;        /* Return value */
+    const char *   testfile = H5_get_srcdir_filename(CORRUPTED_ATNAMELEN_FILE); /* Corrected test file name */
 
     const char *err_message = "attribute name has different length than stored length";
-                        /* the error message produced when the failure occurs */
+    /* the error message produced when the failure occurs */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing the Handling of Corrupted Attribute's Name Length\n"));
@@ -992,8 +1010,7 @@ static void test_corrupted_attnamelen(void)
     VERIFY(err_status, FAIL, "H5Aiterate2");
 
     /* Make sure the intended error was caught */
-    if(err_status == -1)
-    {
+    if (err_status == -1) {
         /* Initialize client data */
         HDstrcpy(err_caught.message, err_message);
         err_caught.found = false;
@@ -1021,15 +1038,16 @@ static void test_corrupted_attnamelen(void)
 **  test_links_deprec(): Test soft and hard link iteration
 **
 ****************************************************************/
-static void test_links_deprec(hid_t fapl)
+static void
+test_links_deprec(hid_t fapl)
 {
-    hid_t file;             /* File ID */
-    char obj_name[NAMELEN]; /* Names of the object in group */
-    ssize_t name_len;       /* Length of object's name */
-    hid_t    gid, gid1;
-    H5G_info_t ginfo;       /* Buffer for querying object's info */
-    hsize_t i;
-    herr_t ret;            /* Generic return value */
+    hid_t      file;              /* File ID */
+    char       obj_name[NAMELEN]; /* Names of the object in group */
+    ssize_t    name_len;          /* Length of object's name */
+    hid_t      gid, gid1;
+    H5G_info_t ginfo; /* Buffer for querying object's info */
+    hsize_t    i;
+    herr_t     ret; /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Soft and Hard Link Iteration Functionality Using Deprecated Routines\n"));
@@ -1057,12 +1075,13 @@ static void test_links_deprec(hid_t fapl)
     VERIFY(ginfo.nlinks, 3, "H5Gget_info");
 
     /* Test these two functions, H5Oget_info_by_idx and H5Lget_name_by_idx */
-    for(i = 0; i < ginfo.nlinks; i++) {
-        H5O_info2_t oinfo;              /* Object info */
-        H5L_info2_t linfo;              /* Link info */
+    for (i = 0; i < ginfo.nlinks; i++) {
+        H5O_info2_t oinfo; /* Object info */
+        H5L_info2_t linfo; /* Link info */
 
         /* Get link name */
-        name_len = H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, i, obj_name, (size_t)NAMELEN, H5P_DEFAULT);
+        name_len = H5Lget_name_by_idx(gid, ".", H5_INDEX_NAME, H5_ITER_INC, i, obj_name, (size_t)NAMELEN,
+                                      H5P_DEFAULT);
         CHECK(name_len, FAIL, "H5Lget_name_by_idx");
 
         /* Get link type */
@@ -1070,16 +1089,17 @@ static void test_links_deprec(hid_t fapl)
         CHECK(ret, FAIL, "H5Lget_info_by_idx1");
 
         /* Get object type */
-        if(linfo.type == H5L_TYPE_HARD) {
-            ret = H5Oget_info_by_idx3(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+        if (linfo.type == H5L_TYPE_HARD) {
+            ret = H5Oget_info_by_idx3(gid, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo,
+                                      H5O_INFO_BASIC, H5P_DEFAULT);
             CHECK(ret, FAIL, "H5Oget_info_by_idx");
         } /* end if */
 
-        if(!HDstrcmp(obj_name, "g1.1"))
+        if (!HDstrcmp(obj_name, "g1.1"))
             VERIFY(oinfo.type, H5O_TYPE_GROUP, "H5Lget_name_by_idx");
-        else if(!HDstrcmp(obj_name, "hardlink"))
+        else if (!HDstrcmp(obj_name, "hardlink"))
             VERIFY(oinfo.type, H5O_TYPE_GROUP, "H5Lget_name_by_idx");
-        else if(!HDstrcmp(obj_name, "softlink"))
+        else if (!HDstrcmp(obj_name, "softlink"))
             VERIFY(linfo.type, H5L_TYPE_SOFT, "H5Lget_name_by_idx");
         else
             CHECK(0, 0, "unknown object name");
@@ -1104,9 +1124,9 @@ static void test_links_deprec(hid_t fapl)
 void
 test_iterate(void)
 {
-    hid_t fapl, fapl2;          /* File access property lists */
-    unsigned new_format;        /* Whether to use the new format or not */
-    herr_t ret;                /* Generic return value */
+    hid_t    fapl, fapl2; /* File access property lists */
+    unsigned new_format;  /* Whether to use the new format or not */
+    herr_t   ret;         /* Generic return value */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Iteration Operations\n"));
@@ -1124,14 +1144,14 @@ test_iterate(void)
     CHECK(ret, FAIL, "H5Pset_libver_bounds");
 
     /* These next tests use the same file */
-    for(new_format = FALSE; new_format <= TRUE; new_format++) {
+    for (new_format = FALSE; new_format <= TRUE; new_format++) {
         test_iter_group(new_format ? fapl2 : fapl, new_format); /* Test group iteration */
-        test_iter_group_large(new_format ? fapl2 : fapl);       /* Test group iteration for large # of objects */
-        test_iter_attr(new_format ? fapl2 : fapl, new_format);  /* Test attribute iteration */
-        test_grp_memb_funcs(new_format ? fapl2 : fapl);         /* Test group member information functions */
-        test_links(new_format ? fapl2 : fapl);                  /* Test soft and hard link iteration */
+        test_iter_group_large(new_format ? fapl2 : fapl); /* Test group iteration for large # of objects */
+        test_iter_attr(new_format ? fapl2 : fapl, new_format); /* Test attribute iteration */
+        test_grp_memb_funcs(new_format ? fapl2 : fapl);        /* Test group member information functions */
+        test_links(new_format ? fapl2 : fapl);                 /* Test soft and hard link iteration */
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-        test_links_deprec(new_format ? fapl2 : fapl);           /* Test soft and hard link iteration */
+        test_links_deprec(new_format ? fapl2 : fapl); /* Test soft and hard link iteration */
 #endif
     } /* end for */
 
@@ -1143,8 +1163,7 @@ test_iterate(void)
     CHECK(ret, FAIL, "H5Pclose");
     ret = H5Pclose(fapl2);
     CHECK(ret, FAIL, "H5Pclose");
-}   /* test_iterate() */
-
+} /* test_iterate() */
 
 /*-------------------------------------------------------------------------
  * Function:    cleanup_iterate
@@ -1165,4 +1184,3 @@ cleanup_iterate(void)
 {
     HDremove(DATAFILE);
 }
-