Merge pull request #20 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10585-investigate-slowness-of-regular

* commit '4d4a88a9f3775d1c6be820208a2699ae38d586b4': (29 commits)
  Fix for H5EA debug package when built in release mode.
  Moved NDEBUG guards to H5EA_DEBUG in H5EA package.
  Added MPICH_SKIP_MPICXX and OMPI_SKIP_CXX to H5public.h to avoid inadvertant linking to the deprecated MPI C++ wrappers. Fixes HDFFV-10893.
  Added a release note for HDFFV-10892 (fcntl lock bug).
  Fix segfault after H5VL_loc_params_t fix merge
  HDFFV-10901 add missing config options
  HDFFV-10854 add release note for windows
  Fix get home dir for windows
  Use variable for test output
  Allow tests to dump output if not comparing
  revert as CHECK will first check for exception
  Clear exception for getting JNI string to clear the exception
  Correct Windows check
  revert windows change
  Windows ssl headers are not in system loacation
  Add include dirs and default lib for windows
  Add policy to use <package>_ROOT
  Add statement for label if code unimplemented
  Update Windows require for CURL to CMake 3.13
  Fix unused var
  ...

1 files changed, 431 insertions, 615 deletions

diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 7e2a431..20a68e8 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -165,12 +165,6 @@ static herr_t visit_obj(hid_t file, const char *oname, iter_t *iter);
  * Purpose: Prints a usage message on stderr and then returns.
  *
  * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, July 16, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -251,16 +245,9 @@ usage (void)
  * Function: print_string
  *
  * Purpose: Print a string value by escaping unusual characters. If
- *  STREAM is null then we only count how large the output would
- *  be.
+ *          STREAM is null then we only count how large the output would be.
  *
  * Return: Number of characters printed.
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
@@ -271,27 +258,33 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
     for (/*void*/; s && *s; s++) {
         switch (*s) {
             case '"':
-                if (buffer) h5tools_str_append(buffer, "\\\"");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\\"");
                 nprint += 2;
                 break;
             case '\\':
-                if (buffer) h5tools_str_append(buffer, "\\\\");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\\\");
                 nprint += 2;
                 break;
             case '\b':
-                if (buffer) h5tools_str_append(buffer, "\\b");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\b");
                 nprint += 2;
                 break;
             case '\f':
-                if (buffer) h5tools_str_append(buffer, "\\f");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\f");
                 nprint += 2;
                 break;
             case '\n':
-                if (buffer) h5tools_str_append(buffer, "\\n");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\n");
                 nprint += 2;
                 break;
             case '\r':
-                if (buffer) h5tools_str_append(buffer, "\\r");
+                if (buffer)
+                    h5tools_str_append(buffer, "\\r");
                 nprint += 2;
                 break;
             case '\t':
@@ -300,21 +293,25 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
                 break;
             case ' ':
                 if (escape_spaces) {
-                    if (buffer) h5tools_str_append(buffer, "\\ ");
+                    if (buffer)
+                        h5tools_str_append(buffer, "\\ ");
                     nprint += 2;
                 }
                 else {
-                    if (buffer) h5tools_str_append(buffer, " ");
+                    if (buffer)
+                        h5tools_str_append(buffer, " ");
                     nprint++;
                 }
                 break;
             default:
                 if (isprint((int)*s)) {
-                    if (buffer) h5tools_str_append(buffer, "%c", *s);
+                    if (buffer)
+                        h5tools_str_append(buffer, "%c", *s);
                     nprint++;
                 }
                 else {
-                    if (buffer) h5tools_str_append(buffer, "\\%03o", *((const unsigned char*)s));
+                    if (buffer)
+                        h5tools_str_append(buffer, "\\%03o", *((const unsigned char*)s));
                     nprint += 4;
                 }
                 break;
@@ -330,14 +327,7 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
  * Purpose: Print an object name and another string.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Quincey Koziol
- *              Tuesday, November  6, 2007
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static int
@@ -348,19 +338,19 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname,
     const char *name = fullname;                /* Pointer to buffer for printing */
     int  n;
 
-    if(show_file_name_g)
+    if (show_file_name_g)
         HDsnprintf(fullname, sizeof(fullname), "%s/%s", iter->fname, oname + iter->name_start);
     else
         name = oname + iter->name_start;
 
     /* Print the object name, either full name or base name */
-    if(fullname_g)
+    if (fullname_g)
         n = print_string(buffer, name, TRUE);
     else {
         const char *last_sep;   /* The location of the last group separator */
 
         /* Find the last component of the path name */
-        if(NULL == (last_sep = HDstrrchr(name, '/')))
+        if (NULL == (last_sep = HDstrrchr(name, '/')))
             last_sep = name;
         else {
             last_sep++;
@@ -379,116 +369,151 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname,
  * Purpose: Prints the name of a native C data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed.
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *   Robb Matzke, 1999-06-11
- *  Added the C9x types, but we still prefer to display the types
- *  from the C language itself (like `int' vs. `int32_t').
- *
+ *         Failure: FALSE, nothing printed.
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    if(!simple_output_g) {
-        if (H5Tequal(type, H5T_NATIVE_SCHAR)==TRUE) {
+    if (!simple_output_g) {
+        if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE) {
             h5tools_str_append(buffer, "native signed char");
-        } else if (H5Tequal(type, H5T_NATIVE_UCHAR)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE) {
             h5tools_str_append(buffer, "native unsigned char");
-        } else if (H5Tequal(type, H5T_NATIVE_INT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE) {
             h5tools_str_append(buffer, "native int");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE) {
             h5tools_str_append(buffer, "native unsigned int");
-        } else if (H5Tequal(type, H5T_NATIVE_SHORT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE) {
             h5tools_str_append(buffer, "native short");
-        } else if (H5Tequal(type, H5T_NATIVE_USHORT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE) {
             h5tools_str_append(buffer, "native unsigned short");
-        } else if (H5Tequal(type, H5T_NATIVE_LONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE) {
             h5tools_str_append(buffer, "native long");
-        } else if (H5Tequal(type, H5T_NATIVE_ULONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE) {
             h5tools_str_append(buffer, "native unsigned long");
-        } else if (H5Tequal(type, H5T_NATIVE_LLONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE) {
             h5tools_str_append(buffer, "native long long");
-        } else if (H5Tequal(type, H5T_NATIVE_ULLONG)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE) {
             h5tools_str_append(buffer, "native unsigned long long");
-        } else if (H5Tequal(type, H5T_NATIVE_FLOAT)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE) {
             h5tools_str_append(buffer, "native float");
-        } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE) {
             h5tools_str_append(buffer, "native double");
+        }
 #if H5_SIZEOF_LONG_DOUBLE !=0
-        } else if (H5Tequal(type, H5T_NATIVE_LDOUBLE)==TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_LDOUBLE) == TRUE) {
             h5tools_str_append(buffer, "native long double");
+        }
 #endif
-        } else if (H5Tequal(type, H5T_NATIVE_INT8)==TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT8) == TRUE) {
             h5tools_str_append(buffer, "native int8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT8) == TRUE) {
             h5tools_str_append(buffer, "native uint8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT16) == TRUE) {
             h5tools_str_append(buffer, "native int16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT16) == TRUE) {
             h5tools_str_append(buffer, "native uint16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT32) == TRUE) {
             h5tools_str_append(buffer, "native int32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT32) == TRUE) {
             h5tools_str_append(buffer, "native uint32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT64) == TRUE) {
             h5tools_str_append(buffer, "native int64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT64) == TRUE) {
             h5tools_str_append(buffer, "native uint64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST8) == TRUE) {
             h5tools_str_append(buffer, "native int_least8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST8) == TRUE) {
             h5tools_str_append(buffer, "native uint_least8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST16) == TRUE) {
             h5tools_str_append(buffer, "native int_least16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST16) == TRUE) {
             h5tools_str_append(buffer, "native uint_least16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST32) == TRUE) {
             h5tools_str_append(buffer, "native int_least32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST32) == TRUE) {
             h5tools_str_append(buffer, "native uint_least32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_LEAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST64) == TRUE) {
             h5tools_str_append(buffer, "native int_least64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST64) == TRUE) {
             h5tools_str_append(buffer, "native uint_least64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST8) == TRUE) {
             h5tools_str_append(buffer, "native int_fast8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST8) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast8_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST16) == TRUE) {
             h5tools_str_append(buffer, "native int_fast16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST16) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast16_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST32) == TRUE) {
             h5tools_str_append(buffer, "native int_fast32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST32) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast32_t");
-        } else if (H5Tequal(type, H5T_NATIVE_INT_FAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST64) == TRUE) {
             h5tools_str_append(buffer, "native int_fast64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT_FAST64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST64) == TRUE) {
             h5tools_str_append(buffer, "native uint_fast64_t");
-        } else if (H5Tequal(type, H5T_NATIVE_B8)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B8) == TRUE) {
             h5tools_str_append(buffer, "native 8-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_B16)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B16) == TRUE) {
             h5tools_str_append(buffer, "native 16-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_B32)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B32) == TRUE) {
             h5tools_str_append(buffer, "native 32-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_B64)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_B64) == TRUE) {
             h5tools_str_append(buffer, "native 64-bit field");
-        } else if (H5Tequal(type, H5T_NATIVE_HSIZE)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HSIZE) == TRUE) {
             h5tools_str_append(buffer, "native hsize_t");
-        } else if (H5Tequal(type, H5T_NATIVE_HSSIZE)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HSSIZE) == TRUE) {
             h5tools_str_append(buffer, "native hssize_t");
-        } else if (H5Tequal(type, H5T_NATIVE_HERR)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HERR) == TRUE) {
             h5tools_str_append(buffer, "native herr_t");
-        } else if (H5Tequal(type, H5T_NATIVE_HBOOL)==TRUE) {
+        }
+        else if (H5Tequal(type, H5T_NATIVE_HBOOL) == TRUE) {
             h5tools_str_append(buffer, "native hbool_t");
-        } else {
+        }
+        else {
             return print_int_type(buffer, type, ind);
         }
     } else {
@@ -504,29 +529,22 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Print the name of an IEEE floating-point data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_ieee_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    if (H5Tequal(type, H5T_IEEE_F32BE)==TRUE) {
+    if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 32-bit big-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F32LE)==TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 32-bit little-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F64BE)==TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 64-bit big-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F64LE)==TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE) {
         h5tools_str_append(buffer, "IEEE 64-bit little-endian float");
     }
     else {
@@ -540,16 +558,10 @@ print_ieee_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Function: print_precision
  *
  * Purpose: Prints information on the next line about precision and
- *  padding if the precision is less than the total data type
- *  size.
+ *          padding if the precision is less than the total data type
+ *          size.
  *
  * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -564,13 +576,12 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
     /* If the precision is less than the total size then show the precision
      * and offset on the following line.  Also display the padding
      * information. */
-    if(8 * H5Tget_size(type) != (prec = H5Tget_precision(type))) {
+    if (8 * H5Tget_size(type) != (prec = H5Tget_precision(type))) {
         h5tools_str_append(buffer, "\n%*s(%lu bit%s of precision beginning at bit %lu)",
-            ind, "", (unsigned long)prec, 1 == prec ? "" : "s",
-            (unsigned long)H5Tget_offset(type));
+                ind, "", (unsigned long)prec, 1 == prec ? "" : "s", (unsigned long)H5Tget_offset(type));
 
         H5Tget_pad(type, &plsb, &pmsb);
-        if(H5Tget_offset(type) > 0) {
+        if (H5Tget_offset(type) > 0) {
             switch(plsb) {
                 case H5T_PAD_ZERO:
                     plsb_s = "zero";
@@ -589,7 +600,7 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
                     break;
             }
         }
-        if((unsigned)H5Tget_offset(type) + prec < 8 * H5Tget_size(type)) {
+        if ((unsigned)H5Tget_offset(type) + prec < 8 * H5Tget_size(type)) {
             switch(pmsb) {
                 case H5T_PAD_ZERO:
                     pmsb_s = "zero";
@@ -612,15 +623,13 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
             h5tools_str_append(buffer, "\n%*s(", ind, "");
             if (plsb_s) {
                 nbits = (unsigned)H5Tget_offset(type);
-                h5tools_str_append(buffer, "%lu %s bit%s at bit 0",
-                        (unsigned long)nbits, plsb_s, 1 == nbits ? "" : "s");
+                h5tools_str_append(buffer, "%lu %s bit%s at bit 0", (unsigned long)nbits, plsb_s, 1 == nbits ? "" : "s");
             }
-            if (plsb_s && pmsb_s) h5tools_str_append(buffer, ", ");
+            if (plsb_s && pmsb_s)
+                h5tools_str_append(buffer, ", ");
             if (pmsb_s) {
                 nbits = (8 * H5Tget_size(type)) - ((unsigned)H5Tget_offset(type) + prec);
-                h5tools_str_append(buffer, "%lu %s bit%s at bit %lu",
-                        (unsigned long)nbits, pmsb_s, 1 == nbits ? "" : "s",
-                        (unsigned long)(8 * H5Tget_size(type) - nbits));
+                h5tools_str_append(buffer, "%lu %s bit%s at bit %lu", (unsigned long)nbits, pmsb_s, 1 == nbits ? "" : "s", (unsigned long)(8 * H5Tget_size(type) - nbits));
             }
             h5tools_str_append(buffer, ")");
         }
@@ -632,41 +641,35 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
  * Function: print_int_type
  *
  * Purpose: Print the name of an integer data type.  Common information
- *  like number of bits, byte order, and sign scheme appear on
- *  the first line. Additional information might appear in
- *  parentheses on the following lines.
+ *          like number of bits, byte order, and sign scheme appear on
+ *          the first line. Additional information might appear in
+ *          parentheses on the following lines.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    H5T_order_t order;          /* byte order value */
-    const char  *order_s=NULL;  /* byte order string */
-    H5T_sign_t  sign;           /* sign scheme value */
-    const char  *sign_s=NULL;   /* sign scheme string */
+    H5T_order_t order;            /* byte order value */
+    const char  *order_s = NULL;  /* byte order string */
+    H5T_sign_t  sign;             /* sign scheme value */
+    const char  *sign_s = NULL;   /* sign scheme string */
 
-    if (H5T_INTEGER!=H5Tget_class(type)) return FALSE;
+    if (H5T_INTEGER != H5Tget_class(type))
+        return FALSE;
 
     /* Byte order */
-    if (H5Tget_size(type)>1) {
+    if (H5Tget_size(type) > 1) {
         order = H5Tget_order(type);
-        if (H5T_ORDER_LE==order) {
+        if (H5T_ORDER_LE == order) {
             order_s = " little-endian";
         }
-        else if (H5T_ORDER_BE==order) {
+        else if (H5T_ORDER_BE == order) {
             order_s = " big-endian";
         }
-        else if (H5T_ORDER_VAX==order) {
+        else if (H5T_ORDER_VAX == order) {
             order_s = " mixed-endian";
         }
         else {
@@ -678,11 +681,11 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
     }
 
     /* Sign */
-    if ((sign=H5Tget_sign(type))>=0) {
-        if (H5T_SGN_NONE==sign) {
+    if ((sign = H5Tget_sign(type)) >= 0) {
+        if (H5T_SGN_NONE == sign) {
             sign_s = " unsigned";
         }
-        else if (H5T_SGN_2==sign) {
+        else if (H5T_SGN_2 == sign) {
             sign_s = "";
         }
         else {
@@ -695,8 +698,7 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     /* Print size, order, and sign on first line, precision and padding
      * information on the subsequent lines */
-    h5tools_str_append(buffer, "%lu-bit%s%s integer",
-            (unsigned long)(8*H5Tget_size(type)), order_s, sign_s);
+    h5tools_str_append(buffer, "%lu-bit%s%s integer", (unsigned long)(8*H5Tget_size(type)), order_s, sign_s);
     print_precision(buffer, type, ind);
     return TRUE;
 }
@@ -708,14 +710,7 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Print info about a floating point data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -732,18 +727,19 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
     H5T_pad_t   pad;            /* internal padding value */
     const char  *pad_s=NULL;    /* internal padding string */
 
-    if (H5T_FLOAT!=H5Tget_class(type)) return FALSE;
+    if (H5T_FLOAT != H5Tget_class(type))
+        return FALSE;
 
     /* Byte order */
-    if (H5Tget_size(type)>1) {
+    if (H5Tget_size(type) > 1) {
         order = H5Tget_order(type);
-        if (H5T_ORDER_LE==order) {
+        if (H5T_ORDER_LE == order) {
             order_s = " little-endian";
         }
-        else if (H5T_ORDER_BE==order) {
+        else if (H5T_ORDER_BE == order) {
             order_s = " big-endian";
         }
-        else if (H5T_ORDER_VAX==order) {
+        else if (H5T_ORDER_VAX == order) {
             order_s = " mixed-endian";
         }
         else {
@@ -756,8 +752,7 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     /* Print size and byte order on first line, precision and padding on
      * subsequent lines. */
-    h5tools_str_append(buffer, "%lu-bit%s floating-point",
-        (unsigned long)(8*H5Tget_size(type)), order_s);
+    h5tools_str_append(buffer, "%lu-bit%s floating-point", (unsigned long)(8*H5Tget_size(type)), order_s);
     print_precision(buffer, type, ind);
 
     /* Print sizes, locations, and other information about each field */
@@ -782,15 +777,13 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
         break;
     }
     h5tools_str_append(buffer, "\n%*s(significant for %lu bit%s at bit %lu%s)", ind, "",
-            (unsigned long)msize, 1==msize?"":"s", (unsigned long)mpos,
-            norm_s);
+            (unsigned long)msize, 1==msize?"":"s", (unsigned long)mpos, norm_s);
     h5tools_str_append(buffer, "\n%*s(exponent for %lu bit%s at bit %lu, bias is 0x%lx)",
-            ind, "", (unsigned long)esize, 1==esize?"":"s",
-            (unsigned long)epos, (unsigned long)ebias);
+            ind, "", (unsigned long)esize, 1==esize?"":"s", (unsigned long)epos, (unsigned long)ebias);
     h5tools_str_append(buffer, "\n%*s(sign bit at %lu)", ind, "", (unsigned long)spos);
 
     /* Display internal padding */
-    if (1+esize+msize<H5Tget_precision(type)) {
+    if ((1 + esize + msize) < H5Tget_precision(type)) {
         pad = H5Tget_inpad(type);
         switch (pad) {
             case H5T_PAD_ZERO:
@@ -822,12 +815,7 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Print info about a compound data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -846,14 +834,12 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
         return FALSE;
 
     h5tools_str_append(buffer, "struct {");
-    for(i = 0; i < (unsigned)nmembs; i++) {
-
+    for (i = 0; i < (unsigned)nmembs; i++) {
         /* Name and offset */
         name = H5Tget_member_name(type, i);
         h5tools_str_append(buffer, "\n%*s\"", ind+4, "");
         n = print_string(buffer, name, FALSE);
-        h5tools_str_append(buffer, "\"%*s +%-4lu ", MAX(0, 16-n), "",
-               (unsigned long)H5Tget_member_offset(type, i));
+        h5tools_str_append(buffer, "\"%*s +%-4lu ", MAX(0, 16-n), "", (unsigned long)H5Tget_member_offset(type, i));
         H5free_memory(name);
 
         /* Member's type */
@@ -862,8 +848,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
         H5Tclose(subtype);
     }
     size = H5Tget_size(type);
-    h5tools_str_append(buffer, "\n%*s} %lu byte%s",
-                ind, "", (unsigned long)size, 1==size?"":"s");
+    h5tools_str_append(buffer, "\n%*s} %lu byte%s", ind, "", (unsigned long)size, 1==size?"":"s");
 
     return TRUE;
 }
@@ -875,14 +860,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Print info about an enumeration data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Wednesday, December 23, 1998
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -891,9 +869,9 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     int         nmembs;         /* number of members */
     hid_t       super;          /* enum base integer type */
 
-    if(H5T_ENUM != H5Tget_class(type))
+    if (H5T_ENUM != H5Tget_class(type))
         return FALSE;
-    if((nmembs = H5Tget_nmembers(type)) < 0)
+    if ((nmembs = H5Tget_nmembers(type)) < 0)
         return FALSE;
 
     super = H5Tget_super(type);
@@ -901,7 +879,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
     print_type(buffer, super, ind + 4);
     h5tools_str_append(buffer, " {");
 
-    if(nmembs > 0) {
+    if (nmembs > 0) {
         char        **name;         /* member names */
         unsigned char *value;       /* value array */
         hid_t       native = -1;    /* native integer data type */
@@ -913,9 +891,9 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
          *  1. long long -- the largest native signed integer
          *  2. unsigned long long -- the largest native unsigned integer
          *  3. raw format */
-        if(H5Tget_size(type) <= sizeof(long long)) {
+        if (H5Tget_size(type) <= sizeof(long long)) {
             dst_size = sizeof(long long);
-            if(H5T_SGN_NONE == H5Tget_sign(type))
+            if (H5T_SGN_NONE == H5Tget_sign(type))
                 native = H5T_NATIVE_ULLONG;
             else
                 native = H5T_NATIVE_LLONG;
@@ -926,16 +904,16 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
         /* Get the names and raw values of all members */
         name = (char **)HDcalloc((size_t)nmembs, sizeof(char *));
         value = (unsigned char *)HDcalloc((size_t)nmembs, MAX(H5Tget_size(type), dst_size));
-        for(i = 0; i < (unsigned)nmembs; i++) {
+        for (i = 0; i < (unsigned)nmembs; i++) {
             name[i] = H5Tget_member_name(type, i);
             H5Tget_member_value(type, i, value + i * H5Tget_size(type));
         }
 
         /* Convert values to native data type */
-        if(native > 0)
-            if(H5Tconvert(super, native, (size_t)nmembs, value, NULL, H5P_DEFAULT) < 0) {
+        if (native > 0)
+            if (H5Tconvert(super, native, (size_t)nmembs, value, NULL, H5P_DEFAULT) < 0) {
                 /* Release resources */
-                for(i = 0; i < (unsigned)nmembs; i++)
+                for (i = 0; i < (unsigned)nmembs; i++)
                     H5free_memory(name[i]);
                 HDfree(name);
                 HDfree(value);
@@ -947,7 +925,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
         /*not implemented yet*/
 
         /* Print members */
-        for(i = 0; i < (unsigned)nmembs; i++) {
+        for (i = 0; i < (unsigned)nmembs; i++) {
             unsigned char *copy;        /* a pointer to value array */
             int         nchars;         /* number of output characters */
 
@@ -955,14 +933,14 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
             nchars = print_string(buffer, name[i], TRUE);
             h5tools_str_append(buffer, "%*s = ", MAX(0, 16 - nchars), "");
 
-            if(native < 0) {
+            if (native < 0) {
                 size_t j;
 
                 h5tools_str_append(buffer, "0x");
-                for(j = 0; j < dst_size; j++)
+                for (j = 0; j < dst_size; j++)
                     h5tools_str_append(buffer, "%02x", value[i*dst_size+j]);
             }
-            else if(H5T_SGN_NONE == H5Tget_sign(native)) {
+            else if (H5T_SGN_NONE == H5Tget_sign(native)) {
                 /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
                  *strangely, unless use another pointer "copy".*/
                 copy = value + i * dst_size;
@@ -972,8 +950,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
                 /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
                  *strangely, unless use another pointer "copy".*/
                 copy = value + i * dst_size;
-                h5tools_str_append(buffer, "%"H5_PRINTF_LL_WIDTH"d",
-                        *((long long*)((void*)copy)));
+                h5tools_str_append(buffer, "%"H5_PRINTF_LL_WIDTH"d", *((long long*)((void*)copy)));
             }
         }
 
@@ -1000,14 +977,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Print information about a string data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1018,7 +988,8 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
     H5T_cset_t  cset;
     const char  *cset_s=NULL;
 
-    if (H5T_STRING!=H5Tget_class(type)) return FALSE;
+    if (H5T_STRING != H5Tget_class(type))
+        return FALSE;
 
     /* Padding */
     pad = H5Tget_strpad(type);
@@ -1101,32 +1072,23 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
  * Purpose: Prints information about a reference data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *   Robb Matzke, 1999-06-04
- *  Knows about object and dataset region references.
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
 print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
 {
-    if (H5T_REFERENCE!=H5Tget_class(type)) return FALSE;
+    if (H5T_REFERENCE != H5Tget_class(type))
+        return FALSE;
 
-    if (H5Tequal(type, H5T_STD_REF_OBJ)==TRUE) {
+    if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
         h5tools_str_append(buffer, "object reference");
     }
-    else if (H5Tequal(type, H5T_STD_REF_DSETREG)==TRUE) {
+    else if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) {
         h5tools_str_append(buffer, "dataset region reference");
     }
     else {
-        h5tools_str_append(buffer, "%lu-byte unknown reference",
-                (unsigned long)H5Tget_size(type));
+        h5tools_str_append(buffer, "%lu-byte unknown reference", (unsigned long)H5Tget_size(type));
     }
 
     return TRUE;
@@ -1139,14 +1101,7 @@ print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
  * Purpose: Prints information about an opaque data type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Robb Matzke
- *              Monday, June  7, 1999
- *
- * Modifications:
- *
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1155,11 +1110,12 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
     char *tag;
     size_t size;
 
-    if (H5T_OPAQUE!=H5Tget_class(type)) return FALSE;
+    if (H5T_OPAQUE != H5Tget_class(type))
+        return FALSE;
 
     size = H5Tget_size(type);
     h5tools_str_append(buffer, "%lu-byte opaque type", (unsigned long)size);
-    if ((tag=H5Tget_tag(type))) {
+    if ((tag = H5Tget_tag(type))) {
         h5tools_str_append(buffer, "\n%*s(tag = \"", ind, "");
         print_string(buffer, tag, FALSE);
         h5tools_str_append(buffer, "\")");
@@ -1175,13 +1131,7 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose:     Print information about a variable-length type
  *
  * Return:      Success:        TRUE
- *
  *              Failure:        FALSE
- *
- * Programmer:  Robb Matzke
- *              Friday, December  1, 2000
- *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1189,11 +1139,12 @@ print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     hid_t       super;
 
-    if (H5T_VLEN!=H5Tget_class(type)) return FALSE;
+    if (H5T_VLEN != H5Tget_class(type))
+        return FALSE;
 
-    h5tools_str_append(buffer, "variable length of\n%*s", ind+4, "");
+    h5tools_str_append(buffer, "variable length of\n%*s", ind + 4, "");
     super = H5Tget_super(type);
-    print_type(buffer, super, ind+4);
+    print_type(buffer, super, ind + 4);
     H5Tclose(super);
     return TRUE;
 }
@@ -1203,13 +1154,7 @@ print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose:     Print information about an array type
  *
  * Return:      Success:        TRUE
- *
  *              Failure:        FALSE
- *
- * Programmer:  Robb Matzke
- *              Thursday, January 31, 2002
- *
- * Modifications:
  *---------------------------------------------------------------------------
  */
 static hbool_t
@@ -1219,7 +1164,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
     int         ndims, i;
     hsize_t     *dims=NULL;
 
-    if (H5T_ARRAY!=H5Tget_class(type))
+    if (H5T_ARRAY != H5Tget_class(type))
         return FALSE;
     ndims = H5Tget_array_ndims(type);
     if (ndims) {
@@ -1227,7 +1172,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
         H5Tget_array_dims2(type, dims);
 
         /* Print dimensions */
-        for (i=0; i<ndims; i++)
+        for (i = 0; i < ndims; i++)
             h5tools_str_append(buffer, "%s" HSIZE_T_FORMAT , i?",":"[", dims[i]);
         h5tools_str_append(buffer, "]");
 
@@ -1252,16 +1197,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Print information about a bitfield type.
  *
  * Return: Success: TRUE
- *
- *  Failure: FALSE, nothing printed
- *
- * Programmer: Pedro Vicente
- *              Tuesday, May  20, 2003
- *
- * Modifications:
- *              Robb Matzke, LLNL 2003-06-05
- *              Generalized Pedro's original if/then/else.  Also display
- *              precision/offset information.
+ *         Failure: FALSE, nothing printed
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1270,24 +1206,28 @@ print_bitfield_type(h5tools_str_t *buffer, hid_t type, int ind)
     H5T_order_t order;          /* byte order value */
     const char  *order_s=NULL;  /* byte order string */
 
-    if (H5T_BITFIELD!=H5Tget_class(type)) return FALSE;
+    if (H5T_BITFIELD != H5Tget_class(type))
+        return FALSE;
     if (H5Tget_size(type)>1) {
         order = H5Tget_order(type);
-        if (H5T_ORDER_LE==order) {
+        if (H5T_ORDER_LE == order) {
             order_s = " little-endian";
-        } else if (H5T_ORDER_BE==order) {
+        }
+        else if (H5T_ORDER_BE == order) {
             order_s = " big-endian";
-        } else if (H5T_ORDER_VAX==order) {
+        }
+        else if (H5T_ORDER_VAX == order) {
             order_s = " mixed-endian";
-        } else {
+        }
+        else {
             order_s = "unknown-byte-order";
         }
-    } else {
+    }
+    else {
         order_s = "";
     }
 
-    h5tools_str_append(buffer, "%lu-bit%s bitfield",
-           (unsigned long)(8*H5Tget_size(type)), order_s);
+    h5tools_str_append(buffer, "%lu-bit%s bitfield", (unsigned long)(8*H5Tget_size(type)), order_s);
     print_precision(buffer, type, ind);
     return TRUE;
 }
@@ -1301,16 +1241,9 @@ print_bitfield_type(h5tools_str_t *buffer, hid_t type, int ind)
  *  there might be line-feeds inside the type definition).  The
  *  first line is assumed to have IND characters before it on
  *  the same line (printed by the caller).
- *
- * Return: void
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *   Robb Matzke, 1999-06-11
  *  Prints the OID of shared data types.
  *
+ * Return: void
  *-------------------------------------------------------------------------
  */
 static void
@@ -1319,24 +1252,23 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
     H5T_class_t  data_class = H5Tget_class(type);
 
     /* Bad data type */
-    if (type<0) {
+    if (type < 0) {
         h5tools_str_append(buffer,"<ERROR>");
         return;
     }
 
     /* Shared? If so then print the type's OID */
-    if(H5Tcommitted(type)) {
+    if (H5Tcommitted(type)) {
         H5O_info_t  oi;
 
-        if(H5Oget_info2(type, &oi, H5O_INFO_BASIC) >= 0)
-            h5tools_str_append(buffer,"shared-%lu:"H5_PRINTF_HADDR_FMT" ",
-                    oi.fileno, oi.addr);
+        if (H5Oget_info2(type, &oi, H5O_INFO_BASIC) >= 0)
+            h5tools_str_append(buffer,"shared-%lu:"H5_PRINTF_HADDR_FMT" ", oi.fileno, oi.addr);
         else
             h5tools_str_append(buffer,"shared ");
     } /* end if */
 
     /* Print the type */
-    if(print_native_type(buffer, type, ind) ||
+    if (print_native_type(buffer, type, ind) ||
             print_ieee_type(buffer, type, ind) ||
             print_cmpd_type(buffer, type, ind) ||
             print_enum_type(buffer, type, ind) ||
@@ -1349,8 +1281,7 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
         return;
 
     /* Unknown type */
-    h5tools_str_append(buffer,"%lu-byte class-%u unknown",
-            (unsigned long)H5Tget_size(type), (unsigned)data_class);
+    h5tools_str_append(buffer,"%lu-byte class-%u unknown", (unsigned long)H5Tget_size(type), (unsigned)data_class);
 }
 
 
@@ -1360,14 +1291,6 @@ print_type(h5tools_str_t *buffer, hid_t type, int ind)
  * Purpose: Prints all values of a dataset.
  *
  * Return: void
- *
- * Programmer: Robb Matzke
- *              Tuesday, July 21, 1998
- *
- * Modifications:
- *  Robb Matzke, 1999-09-27
- *  Understands the simple_output_g switch which causes data to
- *  be displayed in a more machine-readable format.
  *-------------------------------------------------------------------------
  */
 static void
@@ -1407,7 +1330,8 @@ dump_dataset_values(hid_t dset)
         }
         outputformat.cmpd_sep = " ";
 
-        if (label_g) outputformat.cmpd_name = "%s=";
+        if (label_g)
+            outputformat.cmpd_name = "%s=";
 
         outputformat.elmt_suf1 = " ";
         outputformat.str_locale = ESCAPE_HTML;
@@ -1450,7 +1374,7 @@ dump_dataset_values(hid_t dset)
          * command line switch was given. */
         outputformat.raw = TRUE;
     }
-    else if (string_g && 1==size && H5T_INTEGER==H5Tget_class(f_type)) {
+    else if (string_g && 1 == size && H5T_INTEGER == H5Tget_class(f_type)) {
         /* Print 1-byte integer data as an ASCI character string instead of
          * integers if the `-s' or `--string' command-line option was given. */
         outputformat.ascii = TRUE;
@@ -1490,14 +1414,7 @@ dump_dataset_values(hid_t dset)
  * Purpose: Prints information about attributes.
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Friday, June  5, 1998
- *
- * Modifications:
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1530,7 +1447,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
     print_string(&buffer, attr_name, TRUE);
 
-    if((attr = H5Aopen(obj, attr_name, H5P_DEFAULT))) {
+    if ((attr = H5Aopen(obj, attr_name, H5P_DEFAULT))) {
         space = H5Aget_space(attr);
         type = H5Aget_type(attr);
 
@@ -1547,7 +1464,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
             case H5S_SIMPLE:
                 /* simple dataspace */
                 h5tools_str_append(&buffer, " {");
-                for (i=0; i<ndims; i++) {
+                for (i = 0; i < ndims; i++) {
                     h5tools_str_append(&buffer, "%s" HSIZE_T_FORMAT, i?", ":"", size[i]);
                     nelmts *= size[i];
                 }
@@ -1579,7 +1496,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
         /* Data */
         outputformat = *info;
 
-        if(nelmts < 5) {
+        if (nelmts < 5) {
             outputformat.idx_fmt = "";
             outputformat.line_1st  = "        Data:  ";
             outputformat.line_pre  = "               ";
@@ -1598,10 +1515,9 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
         }
 
         outputformat.line_ncols = (unsigned)width_g;
-        if(label_g)
+        if (label_g)
             outputformat.cmpd_name = "%s=";
-        if(string_g && 1==H5Tget_size(type) &&
-                H5T_INTEGER==H5Tget_class(type)) {
+        if (string_g && 1 == H5Tget_size(type) && H5T_INTEGER == H5Tget_class(type)) {
             outputformat.ascii = TRUE;
             outputformat.elmt_suf1 = "";
             outputformat.elmt_suf2 = "";
@@ -1625,13 +1541,13 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
 
         info = &outputformat;
 
-        if(space_type != H5S_NULL && space_type != H5S_NO_CLASS) {
-            if(hexdump_g)
+        if (space_type != H5S_NULL && space_type != H5S_NO_CLASS) {
+            if (hexdump_g)
                 p_type = H5Tcopy(type);
             else
                 p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
-            if(p_type >= 0) {
+            if (p_type >= 0) {
                 /* VL data special information */
                 unsigned int        vl_data = 0; /* contains VL datatypes */
 
@@ -1680,14 +1596,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
  *  printed by the caller.
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Thursday, August 27, 1998
- *
- * Modifications:
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1715,17 +1624,19 @@ dataset_list1(hid_t dset)
     space_type = H5Sget_simple_extent_type(space);
     ndims = H5Sget_simple_extent_dims(space, cur_size, max_size);
     h5tools_str_append(&buffer, " {");
-    for (i=0; i<ndims; i++) {
+    for (i = 0; i < ndims; i++) {
         h5tools_str_append(&buffer, "%s"HSIZE_T_FORMAT, i?", ":"", cur_size[i]);
         if (max_size[i]==H5S_UNLIMITED) {
             h5tools_str_append(&buffer, "/%s", "Inf");
         }
-        else if (max_size[i]!=cur_size[i] || verbose_g>0) {
+        else if (max_size[i] != cur_size[i] || verbose_g > 0) {
             h5tools_str_append(&buffer, "/"HSIZE_T_FORMAT, max_size[i]);
         }
     }
-    if (space_type==H5S_SCALAR) h5tools_str_append(&buffer, "SCALAR");
-    else if (space_type==H5S_NULL) h5tools_str_append(&buffer, "NULL");
+    if (space_type == H5S_SCALAR)
+        h5tools_str_append(&buffer, "SCALAR");
+    else if (space_type == H5S_NULL)
+        h5tools_str_append(&buffer, "NULL");
     h5tools_str_append(&buffer, "}");
     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
     H5Sclose (space);
@@ -1743,14 +1654,7 @@ dataset_list1(hid_t dset)
  *  information which is general to all objects.
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Thursday, August 27, 1998
- *
- * Modifications:
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1786,7 +1690,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
 
     h5tools_str_reset(&buffer);
 
-    if(verbose_g > 0) {
+    if (verbose_g > 0) {
         dcpl = H5Dget_create_plist(dset);
         space = H5Dget_space(dset);
         type = H5Dget_type(dset);
@@ -1800,7 +1704,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                     ndims = H5Pget_chunk(dcpl, (int)NELMTS(chsize), chsize/*out*/);
                     h5tools_str_append(&buffer, "    %-10s {", "Chunks:");
                     total = H5Tget_size(type);
-                    for (i=0; i<ndims; i++) {
+                    for (i = 0; i < ndims; i++) {
                         h5tools_str_append(&buffer, "%s"HSIZE_T_FORMAT, i?", ":"", chsize[i]);
                         total *= chsize[i];
                     }
@@ -1811,29 +1715,25 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                 break;
             case H5D_CONTIGUOUS:
                 /* Print information about external storage */
-                if((nf = H5Pget_external_count(dcpl)) > 0) {
-                    for(i = 0, max_len = 0; i < nf; i++) {
-                        if(H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, NULL, NULL) < 0)
+                if ((nf = H5Pget_external_count(dcpl)) > 0) {
+                    for (i = 0, max_len = 0; i < nf; i++) {
+                        if (H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, NULL, NULL) < 0)
                             continue;
                         n = print_string(NULL, f_name, TRUE);
                         max_len = MAX(max_len, n);
                     } /* end for */
-                    h5tools_str_append(&buffer, "    %-10s %d external file%s\n",
-                            "Extern:", nf, 1==nf?"":"s");
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s %s\n",
-                            "ID", "DSet-Addr", "File-Addr", "Bytes", "File");
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ",
-                            "----", "----------", "----------", "----------");
-                    for (i=0; i<max_len; i++) h5tools_str_append(&buffer, "-");
+                    h5tools_str_append(&buffer, "    %-10s %d external file%s\n", "Extern:", nf, 1==nf?"":"s");
+                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s %s\n", "ID", "DSet-Addr", "File-Addr", "Bytes", "File");
+                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ", "----", "----------", "----------", "----------");
+                    for (i = 0; i < max_len; i++)
+                        h5tools_str_append(&buffer, "-");
                     h5tools_str_append(&buffer, "\n");
-                    for (i=0, total=0; i<nf; i++) {
+                    for (i = 0, total=0; i < nf; i++) {
                         if (H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, &f_offset, &f_size)<0) {
-                            h5tools_str_append(&buffer,
-                                    "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10s %10s ***ERROR*** %s\n",
-                                    i, total, "", "",
-                                    i+1<nf?"Following addresses are incorrect":"");
+                            h5tools_str_append(&buffer, "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10s %10s ***ERROR*** %s\n",
+                                    i, total, "", "", i+1<nf?"Following addresses are incorrect":"");
                         }
-                        else if (H5S_UNLIMITED==f_size) {
+                        else if (H5S_UNLIMITED == f_size) {
                             h5tools_str_append(&buffer, "        #%03d %10"H5_PRINTF_LL_WIDTH"u %10"H5_PRINTF_LL_WIDTH"u %10s ",
                                     i, total, (hsize_t)f_offset, "INF");
                             print_string(&buffer, f_name, TRUE);
@@ -1846,9 +1746,8 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                         h5tools_str_append(&buffer, "\n");
                         total += f_size;
                     }
-                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ",
-                            "----", "----------", "----------", "----------");
-                    for (i=0; i<max_len; i++)
+                    h5tools_str_append(&buffer, "        %4s %10s %10s %10s ", "----", "----------", "----------", "----------");
+                    for (i = 0; i < max_len; i++)
                         h5tools_str_append(&buffer, "-");
                     h5tools_str_append(&buffer, "\n");
                 } /* end if */
@@ -1890,16 +1789,13 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         used = H5Dget_storage_size(dset);
         tclass = H5Tget_class(type);
         h5tools_str_append(&buffer, "    %-10s ", "Storage:");
-        switch (tclass)
-        {
-
+        switch (tclass) {
         case H5T_VLEN:
             h5tools_str_append(&buffer, "information not available");
             break;
 
         case H5T_REFERENCE:
-            if ( H5Tequal(type, H5T_STD_REF_DSETREG))
-            {
+            if (H5Tequal(type, H5T_STD_REF_DSETREG)) {
                 h5tools_str_append(&buffer, "information not available");
             }
             break;
@@ -1916,11 +1812,8 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         case H5T_ARRAY:
         case H5T_NCLASSES:
         default:
-            h5tools_str_append(&buffer, HSIZE_T_FORMAT" logical byte%s, "HSIZE_T_FORMAT" allocated byte%s",
-                total, 1==total?"":"s",
-                used, 1==used?"":"s");
-            if (used>0)
-            {
+            h5tools_str_append(&buffer, HSIZE_T_FORMAT" logical byte%s, "HSIZE_T_FORMAT" allocated byte%s", total, 1==total?"":"s", used, 1==used?"":"s");
+            if (used>0) {
                 utilization = ((double)total * (double)100.0f) / (double)used;
                 h5tools_str_append(&buffer, ", %1.2f%% utilization", utilization);
             }
@@ -1929,18 +1822,14 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         h5tools_str_append(&buffer, "\n");
 
         /* Print information about raw data filters */
-        if((nf = H5Pget_nfilters(dcpl)) > 0) {
-            for(i = 0; i < nf; i++) {
+        if ((nf = H5Pget_nfilters(dcpl)) > 0) {
+            for (i = 0; i < nf; i++) {
                 cd_nelmts = NELMTS(cd_values);
-                filt_id = H5Pget_filter2(dcpl, (unsigned)i, &filt_flags, &cd_nelmts,
-                        cd_values, sizeof(f_name), f_name, NULL);
+                filt_id = H5Pget_filter2(dcpl, (unsigned)i, &filt_flags, &cd_nelmts, cd_values, sizeof(f_name), f_name, NULL);
                 f_name[sizeof(f_name) - 1] = '\0';
                 HDsnprintf(s, sizeof(s), "Filter-%d:", i);
-                h5tools_str_append(&buffer, "    %-10s %s-%u %s {", s,
-                        (f_name[0] ? f_name : "method"),
-                        (unsigned)filt_id,
-                        ((filt_flags & H5Z_FLAG_OPTIONAL) ? "OPT" : ""));
-                for(cd_num = 0; cd_num < cd_nelmts; cd_num++)
+                h5tools_str_append(&buffer, "    %-10s %s-%u %s {", s, (f_name[0] ? f_name : "method"), (unsigned)filt_id, ((filt_flags & H5Z_FLAG_OPTIONAL) ? "OPT" : ""));
+                for (cd_num = 0; cd_num < cd_nelmts; cd_num++)
                     h5tools_str_append(&buffer, "%s%u", (cd_num ? ", " : ""), cd_values[cd_num]);
                 h5tools_str_append(&buffer, "}\n");
             } /* end for */
@@ -1953,7 +1842,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
         /* Print address information */
-        if(address_g)
+        if (address_g)
             H5Ddebug(dset);
 
         /* Close stuff */
@@ -1964,7 +1853,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
 
     h5tools_str_close(&buffer);
 
-    if(data_g)
+    if (data_g)
         dump_dataset_values(dset);
 
     return 0;
@@ -1978,20 +1867,13 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
  *  information which is general to all objects.
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Robb Matzke
- *              Thursday, November  5, 1998
- *
- * Modifications:
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
 datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name)
 {
-    if (verbose_g>0) {
+    if (verbose_g > 0) {
         hsize_t             curr_pos = 0;        /* total data element position   */
         h5tools_str_t       buffer;          /* string into which to render   */
         h5tools_context_t   ctx;             /* print context  */
@@ -2019,12 +1901,7 @@ datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name)
  * Purpose: Prints information about an object
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Quincey Koziol
- *              Tuesday, November 6, 2007
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2043,26 +1920,26 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
     h5tools_str_reset(&buffer);
 
     /* Print the link's name, either full name or base name */
-    if(!iter->symlink_target)
+    if (!iter->symlink_target)
         print_obj_name(&buffer, iter, name, "");
 
     /* Check object information */
-    if(oinfo->type < 0 || oinfo->type >= H5O_TYPE_NTYPES) {
+    if (oinfo->type < 0 || oinfo->type >= H5O_TYPE_NTYPES) {
         h5tools_str_append(&buffer, "Unknown type(%d)", (int)oinfo->type);
         obj_type = H5O_TYPE_UNKNOWN;
     }
-    if(iter->symlink_target)
+    if (iter->symlink_target)
         h5tools_str_append(&buffer, "{");
-    if(obj_type >= 0 && dispatch_g[obj_type].name)
+    if (obj_type >= 0 && dispatch_g[obj_type].name)
         h5tools_str_append(&buffer, "%s", dispatch_g[obj_type].name);
     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
     /* Check if we've seen this object before */
-    if(first_seen) {
+    if (first_seen) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, ", same as ");
         print_string(&buffer, first_seen, TRUE);
-        if(!iter->symlink_target) {
+        if (!iter->symlink_target) {
             h5tools_str_append(&buffer, "\n");
         }
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2073,7 +1950,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         /* Open the object.  Not all objects can be opened.  If this is the case
          * then return right away.
          */
-        if(obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
+        if (obj_type >= 0 && (obj = H5Oopen(iter->fid, name, H5P_DEFAULT)) < 0) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, " *ERROR*\n");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2081,9 +1958,9 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         } /* end if */
 
         /* List the first line of information for the object. */
-        if(obj_type >= 0 && dispatch_g[obj_type].list1)
+        if (obj_type >= 0 && dispatch_g[obj_type].list1)
             (dispatch_g[obj_type].list1)(obj);
-        if(!iter->symlink_target || (verbose_g > 0)) {
+        if (!iter->symlink_target || (verbose_g > 0)) {
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\n");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2091,13 +1968,13 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
 
         /* Show detailed information about the object, beginning with information
          * which is common to all objects. */
-        if(verbose_g > 0) {
+        if (verbose_g > 0) {
             size_t buf_size = 0;
             char* comment = NULL;
             ssize_t cmt_bufsize = -1;
 
             /* Display attributes */
-            if(obj_type >= 0)
+            if (obj_type >= 0)
                 H5Aiterate2(obj, H5_INDEX_NAME, H5_ITER_INC, NULL, list_attr, NULL);
 
             /* Object location & reference count */
@@ -2107,7 +1984,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
             /* Modification time */
-            if(oinfo->mtime > 0) {
+            if (oinfo->mtime > 0) {
                 char buf[256];
                 struct tm *tm;
 
@@ -2115,7 +1992,7 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
                     tm = HDgmtime(&(oinfo->mtime));
                 else
                     tm = HDlocaltime(&(oinfo->mtime));
-                if(tm) {
+                if (tm) {
                     HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "    %-10s %s\n", "Modified:", buf);
@@ -2131,9 +2008,9 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
              * If the call to H5Oget_comment returned an error, skip this block */
             if (cmt_bufsize > 0) {
                 comment = (char *)HDmalloc((size_t)cmt_bufsize + 1); /* new_size including null terminator */
-                if(comment) {
+                if (comment) {
                     cmt_bufsize = H5Oget_comment(obj, comment, (size_t)cmt_bufsize);
-                    if(cmt_bufsize > 0) {
+                    if (cmt_bufsize > 0) {
                         comment[cmt_bufsize] = 0;
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "    %-10s \"", "Comment:");
@@ -2147,16 +2024,16 @@ list_obj(const char *name, const H5O_info_t *oinfo, const char *first_seen, void
         } /* end if */
 
         /* Detailed list for object */
-        if(obj_type >= 0 && dispatch_g[obj_type].list2)
+        if (obj_type >= 0 && dispatch_g[obj_type].list2)
             (dispatch_g[obj_type].list2)(obj, name);
 
         /* Close the object. */
-        if(obj_type >= 0)
+        if (obj_type >= 0)
             H5Oclose(obj);
     } /* end else */
 
 done:
-    if(iter->symlink_target) {
+    if (iter->symlink_target) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "}\n");
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2168,19 +2045,13 @@ done:
 } /* end list_obj() */
 
 
-
 /*-------------------------------------------------------------------------
  * Function: list_lnk
  *
  * Purpose: Prints information about a link
  *
  * Return: Success: 0
- *
- *  Failure: -1
- *
- * Programmer: Quincey Koziol
- *              Thursday, November 8, 2007
- *
+ *         Failure: -1
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2227,15 +2098,13 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             h5tools_str_append(&buffer, buf);
             h5tools_str_append(&buffer, "}");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
-            if(follow_symlink_g)
-            {
+            if (follow_symlink_g) {
                 hbool_t orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, " ");
 
                 /* Check if we have already seen this softlink */
-                if(symlink_is_visited(iter->symlink_list, linfo->type, NULL, buf))
-                {
+                if (symlink_is_visited(iter->symlink_list, linfo->type, NULL, buf)) {
                     h5tools_str_append(&buffer, "{Already Visited}\n");
                     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
@@ -2243,7 +2112,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 /* Add this link to the list of seen softlinks */
-                if(symlink_visit_add(iter->symlink_list, linfo->type, NULL, buf) < 0)
+                if (symlink_visit_add(iter->symlink_list, linfo->type, NULL, buf) < 0)
                     goto done;
 
                 /* Adjust user data to specify that we are operating on the
@@ -2252,11 +2121,10 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
                 /* Prevent recursive listing of soft link target if
                  * recursive_g is off */
-                if(!recursive_g)
+                if (!recursive_g)
                     grp_literal_g = TRUE;
                 /* Recurse through the soft link */
-                if(visit_obj(iter->fid, name, iter) < 0)
-                {
+                if (visit_obj(iter->fid, name, iter) < 0) {
                     grp_literal_g = orig_grp_literal;
                     goto done;
                 }
@@ -2288,7 +2156,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             else if (no_dangling_link_g && ret == 0)
                 iter->symlink_list->dangle_link = TRUE;
 
-            if(H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0)
+            if (H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0)
                 goto done;
 
             h5tools_str_append(&buffer, "External Link {");
@@ -2296,21 +2164,19 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
             h5tools_str_append(&buffer, "/");
             if(*path != '/')
                 h5tools_str_append(&buffer, "/");
-                        h5tools_str_append(&buffer, path);
+            h5tools_str_append(&buffer, path);
             h5tools_str_append(&buffer, "}");
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
             /* Recurse through the external link */
             /* keep the follow_elink_g for backward compatibility with -E */
-            if(follow_link)
-            {
+            if (follow_link) {
                 hbool_t orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, " ");
 
                 /* Check if we have already seen this elink */
-                if(symlink_is_visited(iter->symlink_list, linfo->type, filename, path))
-                {
+                if (symlink_is_visited(iter->symlink_list, linfo->type, filename, path)) {
                     h5tools_str_append(&buffer, "{Already Visited}\n");
                     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
                     goto done;
@@ -2318,8 +2184,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
 
                 /* Add this link to the list of seen elinks */
-                if(symlink_visit_add(iter->symlink_list, linfo->type, filename, path) < 0)
-                {
+                if (symlink_visit_add(iter->symlink_list, linfo->type, filename, path) < 0) {
                     goto done;
                 }
 
@@ -2329,11 +2194,11 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
 
                 /* Prevent recursive listing of external link target if
                  * recursive_g is off */
-                if(!recursive_g)
+                if (!recursive_g)
                     grp_literal_g = TRUE;
 
                 /* Recurse through the external link */
-                if(visit_obj(iter->fid, name, iter) < 0) {
+                if (visit_obj(iter->fid, name, iter) < 0) {
                     grp_literal_g = orig_grp_literal;
                     goto done;
                 }
@@ -2371,11 +2236,6 @@ done:
  * Return:
  *  Success: 0
  *  Failure: -1
- *
- * Programmer: Neil Fortner
- *              Wednesday, August 21, 2008
- *             Mostly copied from main()
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -2394,8 +2254,8 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
     h5tools_str_reset(&buffer);
 
     /* Retrieve info for object to list */
-    if(H5Oget_info_by_name2(file, oname, &oi, H5O_INFO_BASIC|H5O_INFO_TIME, H5P_DEFAULT) < 0) {
-        if(iter->symlink_target) {
+    if (H5Oget_info_by_name2(file, oname, &oi, H5O_INFO_BASIC|H5O_INFO_TIME, H5P_DEFAULT) < 0) {
+        if (iter->symlink_target) {
             h5tools_str_append(&buffer, "{**NOT FOUND**}\n");
             iter->symlink_target = FALSE;
         }
@@ -2407,9 +2267,9 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
     } /* end if */
 
     /* Check for group iteration */
-    if(H5O_TYPE_GROUP == oi.type && !grp_literal_g) {
+    if (H5O_TYPE_GROUP == oi.type && !grp_literal_g) {
         /* Get ID for group */
-        if(!iter->symlink_target && (iter->gid = H5Gopen2(file, oname, H5P_DEFAULT)) < 0) {
+        if (!iter->symlink_target && (iter->gid = H5Gopen2(file, oname, H5P_DEFAULT)) < 0) {
             h5tools_str_append(&buffer, "%s: unable to open '%s' as group\n", iter->fname, oname);
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
             goto done;   /* Previously "continue", when this code was in main().
@@ -2425,7 +2285,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
         h5trav_visit(file, oname, (hbool_t) (display_root_g || iter->symlink_target), recursive_g, list_obj, list_lnk, iter, H5O_INFO_BASIC|H5O_INFO_TIME);
 
         /* Close group */
-        if(!iter->symlink_target)
+        if (!iter->symlink_target)
             H5Gclose(iter->gid);
     } /* end if */
     else {
@@ -2452,14 +2312,7 @@ done:
  *  were borrowed from the GNU less(1).
  *
  * Return: Success: Number of columns.
- *
- *  Failure: Some default number of columms.
- *
- * Programmer: Robb Matzke
- *              Friday, November  6, 1998
- *
- * Modifications:
- *
+ *         Failure: Some default number of columms.
  *-------------------------------------------------------------------------
  */
 static int
@@ -2470,7 +2323,7 @@ get_width(void)
 
     /* Try to get it from the COLUMNS environment variable first since it's
      * value is sometimes wrong. */
-    if ((s=HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
+    if ((s = HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
         width = (int)HDstrtol(s, NULL, 0);
 
 #if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG)
@@ -2518,7 +2371,8 @@ get_width(void)
 #endif
 
     /* Set to at least 1 */
-    if (width<1) width = 1;
+    if (width < 1)
+        width = 1;
     return width;
 }
 
@@ -2530,25 +2384,19 @@ get_width(void)
  * Return:
  *  Success: TRUE (1)
  *  Failure: FALSE (0)
- *
- * Programmer:
- *  Jonathan Kim  (06/15/2010)
- *
  *-------------------------------------------------------------------------*/
 static hbool_t
 is_valid_args(void)
 {
     hbool_t ret = TRUE;
 
-    if(recursive_g && grp_literal_g)
-    {
+    if (recursive_g && grp_literal_g) {
         HDfprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n");
         ret = FALSE;
         goto out;
     }
 
-    if(no_dangling_link_g && !follow_symlink_g)
-    {
+    if (no_dangling_link_g && !follow_symlink_g) {
         HDfprintf(rawerrorstream, "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
         ret = FALSE;
         goto out;
@@ -2565,12 +2413,6 @@ out:
  * Purpose: Close HDF5 and MPI and call exit()
  *
  * Return: Does not return
- *
- * Programmer: Quincey Koziol
- *              Saturday, January 31, 2004
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -2588,29 +2430,22 @@ leave(int ret)
  * Purpose: Opens a file and lists the specified group
  *
  * Return: Success: 0
- *
- *  Failure: 1
- *
- * Programmer: Robb Matzke
- *              Monday, March 23, 1998
- *
- * Modifications:
- *
+ *         Failure: 1
  *-------------------------------------------------------------------------
  */
 int
 main(int argc, const char *argv[])
 {
-    hid_t file = -1;
-    char *fname = NULL, *oname = NULL, *x;
+    hid_t       file = -1;
+    char       *fname = NULL, *oname = NULL, *x;
     const char *s = NULL;
-    char *rest;
-    int  argno;
+    char       *rest;
+    int         argno;
     static char root_name[] = "/";
     char        drivername[50];
     const char *preferred_driver = NULL;
-    int err_exit = 0;
-    hid_t fapl_id = H5P_DEFAULT;
+    int         err_exit = 0;
+    hid_t       fapl_id = H5P_DEFAULT;
 
 #ifdef H5_HAVE_ROS3_VFD
     /* default "anonymous" s3 configuration */
@@ -2650,85 +2485,110 @@ main(int argc, const char *argv[])
     width_g = get_width();
 
     /* Switches come before non-switch arguments */
-    for(argno = 1; argno < argc && '-' == argv[argno][0]; argno++) {
-        if(!HDstrcmp(argv[argno], "--")) {
+    for (argno = 1; argno < argc && '-' == argv[argno][0]; argno++) {
+        if (!HDstrcmp(argv[argno], "--")) {
             /* Last switch */
             argno++;
             break;
-        } else if(!HDstrcmp(argv[argno], "--help")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--help")) {
             usage();
             leave(EXIT_SUCCESS);
-        } else if(!HDstrcmp(argv[argno], "--address")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--address")) {
             address_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--data")) {
+        }
+        else if(!HDstrcmp(argv[argno], "--data")) {
             data_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--enable-error-stack")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--enable-error-stack")) {
             show_errors_g = TRUE;
         /* deprecated --errors */
-        } else if(!HDstrcmp(argv[argno], "--errors")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--errors")) {
             show_errors_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--follow-symlinks")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--follow-symlinks")) {
             follow_symlink_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--no-dangling-links")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--no-dangling-links")) {
             no_dangling_link_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--external")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--external")) {
             follow_elink_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--full")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--full")) {
             fullname_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--group")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--group")) {
             grp_literal_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--label")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--label")) {
             label_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--recursive")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--recursive")) {
             recursive_g = TRUE;
             fullname_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--simple")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--simple")) {
             simple_output_g = TRUE;
-        } else if(!HDstrcmp(argv[argno], "--string")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--string")) {
             string_g = TRUE;
-        } else if(!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
+        }
+        else if (!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
             preferred_driver = argv[argno]+6;
-        } else if(!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
+        }
+        else if (!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
             width_g = (int)HDstrtol(argv[argno]+8, &rest, 0);
 
-            if(0 == width_g)
+            if (0 == width_g)
                 no_line_wrap_g = TRUE;
-            else if(width_g < 0 || *rest) {
+            else if (width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
-        } else if(!HDstrcmp(argv[argno], "--width")) {
-            if((argno + 1) >= argc) {
+        }
+        else if (!HDstrcmp(argv[argno], "--width")) {
+            if ((argno + 1) >= argc) {
                 usage();
                 leave(EXIT_FAILURE);
-            } else {
+            }
+            else {
                 s = argv[++argno];
             }
             width_g = (int)HDstrtol(s, &rest, 0);
-            if(width_g <= 0 || *rest) {
+            if (width_g <= 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
-        } else if(!HDstrcmp(argv[argno], "--verbose")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--verbose")) {
             verbose_g++;
-        } else if(!HDstrcmp(argv[argno], "--version")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--version")) {
             print_version(h5tools_getprogname());
             leave(EXIT_SUCCESS);
-        } else if(!HDstrcmp(argv[argno], "--hexdump")) {
+        }
+        else if (!HDstrcmp(argv[argno], "--hexdump")) {
             hexdump_g = TRUE;
-        } else if(!HDstrncmp(argv[argno], "-w", (size_t)2)) {
-            if(argv[argno][2]) {
+        }
+        else if (!HDstrncmp(argv[argno], "-w", (size_t)2)) {
+            if (argv[argno][2]) {
                 s = argv[argno] + 2;
-            } else if((argno + 1) >= argc) {
+            }
+            else if ((argno + 1) >= argc) {
                 usage();
                 leave(EXIT_FAILURE);
-            } else {
+            }
+            else {
                 s = argv[++argno];
             }
             width_g = (int)HDstrtol(s, &rest, 0);
 
-            if(0 == width_g)
+            if(0 == width_g) {
                 no_line_wrap_g = TRUE;
+            }
             else if(width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
@@ -2736,8 +2596,7 @@ main(int argc, const char *argv[])
 
         } else if (!HDstrncmp(argv[argno], "--s3-cred=", (size_t)10)) {
 #ifndef H5_HAVE_ROS3_VFD
-            HDfprintf(rawerrorstream,
-                      "Error: Read-Only S3 VFD is not enabled\n\n");
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n");
             usage();
             leave(EXIT_FAILURE);
 #else
@@ -2752,26 +2611,20 @@ main(int argc, const char *argv[])
             if (start == NULL) {
                 HDfprintf(rawerrorstream,
                           "Error: Unable to parse null credentials tuple\n"
-                          "    For anonymous access, omit \"--s3-cred\" and use"
-                          "only \"--vfd=ros3\"\n\n");
+                          "    For anonymous access, omit \"--s3-cred\" and use only \"--vfd=ros3\"\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
             start++;
-            if (FAIL ==
-                parse_tuple((const char *)start, ',',
-                            &s3cred_src, &nelems, &s3cred))
-            {
-                HDfprintf(rawerrorstream,
-                          "Error: Unable to parse S3 credentials\n\n");
+            if (FAIL == parse_tuple((const char *)start, ',', &s3cred_src, &nelems, &s3cred)) {
+                HDfprintf(rawerrorstream, "Error: Unable to parse S3 credentials\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
             /* sanity-check tuple count
              */
             if (nelems != 3) {
-                HDfprintf(rawerrorstream,
-                          "Error: Invalid S3 credentials\n\n");
+                HDfprintf(rawerrorstream, "Error: Invalid S3 credentials\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
@@ -2779,8 +2632,7 @@ main(int argc, const char *argv[])
             ccred[1] = (const char *)s3cred[1];
             ccred[2] = (const char *)s3cred[2];
             if (0 == h5tools_populate_ros3_fapl(&ros3_fa, ccred)) {
-                HDfprintf(rawerrorstream,
-                          "Error: Invalid S3 credentials\n\n");
+                HDfprintf(rawerrorstream, "Error: Invalid S3 credentials\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
@@ -2788,13 +2640,13 @@ main(int argc, const char *argv[])
             HDfree(s3cred_src);
 #endif /* H5_HAVE_ROS3_VFD */
 
-        } else if (!HDstrncmp(argv[argno], "--hdfs-attrs=", (size_t)13)) {
+        }
+        else if (!HDstrncmp(argv[argno], "--hdfs-attrs=", (size_t)13)) {
 #ifndef H5_HAVE_LIBHDFS
             PRINTVALSTREAM(rawoutstream, "The HDFS VFD is not enabled.\n");
             leave(EXIT_FAILURE);
 #else
-            /* Parse received configuration data and set fapl config struct
-             */
+            /* Parse received configuration data and set fapl config struct */
 
             hbool_t            _debug    = FALSE;
             unsigned           nelems    = 0;
@@ -2809,20 +2661,16 @@ main(int argc, const char *argv[])
                 HDfprintf(stderr, "configuring hdfs...\n");
             }
             start = argv[argno]+13; /* should never segfault: worst case of */
-            if (*start != '(')      /* null-termintor after '='.            */
-            {
+            if (*start != '(') {    /* null-termintor after '='.            */
+           
                 if (_debug) {
                     HDfprintf(stderr, "    no tuple.\n");
                 }
                 usage();
                 leave(EXIT_FAILURE);
             }
-            if (FAIL ==
-                parse_tuple((const char *)start, ',',
-                            &props_src, &nelems, &props))
-            {
-                HDfprintf(stderr,
-                        "    unable to parse tuple.\n");
+            if (FAIL == parse_tuple((const char *)start, ',', &props_src, &nelems, &props)) {
+                HDfprintf(stderr, "    unable to parse tuple.\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
@@ -2830,20 +2678,13 @@ main(int argc, const char *argv[])
             /* sanity-check tuple count
              */
             if (nelems != 5) {
-                HDfprintf(stderr,
-                        "    expected 5-ple, got `%d`\n",
-                        nelems);
+                HDfprintf(stderr, "    expected 5-ple, got `%d`\n", nelems);
                 usage();
                 leave(EXIT_FAILURE);
             }
             if (_debug) {
-                HDfprintf(stderr,
-                        "    got hdfs-attrs tuple: `(%s,%s,%s,%s,%s)`\n",
-                        props[0],
-                        props[1],
-                        props[2],
-                        props[3],
-                        props[4]);
+                HDfprintf(stderr, "    got hdfs-attrs tuple: `(%s,%s,%s,%s,%s)`\n",
+                        props[0], props[1], props[2], props[3], props[4]);
             }
 
             /* Populate fapl configuration structure with given properties.
@@ -2852,59 +2693,41 @@ main(int argc, const char *argv[])
              */
             if (HDstrncmp(props[0], "", 1)) {
                 if (_debug) {
-                    HDfprintf(stderr,
-                            "    setting namenode name: %s\n",
-                            props[0]);
+                    HDfprintf(stderr, "    setting namenode name: %s\n", props[0]);
                 }
-                HDstrncpy(hdfs_fa.namenode_name,
-                        (const char *)props[0],
-                        HDstrlen(props[0]));
+                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) {
-                    HDfprintf(stderr,
-                            "    supposed port number wasn't.\n");
+                    HDfprintf(stderr, "    supposed port number wasn't.\n");
                     leave(EXIT_FAILURE);
                 }
                 if (_debug) {
-                    HDfprintf(stderr,
-                            "    setting namenode port: %lu\n",
-                            k);
+                    HDfprintf(stderr, "    setting namenode port: %lu\n", k);
                 }
                 hdfs_fa.namenode_port = (int32_t)k;
             }
             if (HDstrncmp(props[2], "", 1)) {
                 if (_debug) {
-                    HDfprintf(stderr,
-                            "    setting kerb cache path: %s\n",
-                            props[2]);
+                    HDfprintf(stderr, "    setting kerb cache path: %s\n", props[2]);
                 }
-                HDstrncpy(hdfs_fa.kerberos_ticket_cache,
-                        (const char *)props[2],
-                        HDstrlen(props[2]));
+                HDstrncpy(hdfs_fa.kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
             }
             if (HDstrncmp(props[3], "", 1)) {
                 if (_debug) {
-                    HDfprintf(stderr,
-                            "    setting username: %s\n",
-                            props[3]);
+                    HDfprintf(stderr, "    setting username: %s\n", props[3]);
                 }
-                HDstrncpy(hdfs_fa.user_name,
-                        (const char *)props[3],
-                        HDstrlen(props[3]));
+                HDstrncpy(hdfs_fa.user_name, (const char *)props[3], HDstrlen(props[3]));
             }
             if (HDstrncmp(props[4], "", 1)) {
                 k = HDstrtoul((const char *)props[4], NULL, 0);
                 if (errno == ERANGE) {
-                    HDfprintf(stderr,
-                            "    supposed buffersize number wasn't.\n");
+                    HDfprintf(stderr, "    supposed buffersize number wasn't.\n");
                     leave(EXIT_FAILURE);
                 }
                 if (_debug) {
-                    HDfprintf(stderr,
-                            "    setting stream buffer size: %lu\n",
-                            k);
+                    HDfprintf(stderr, "    setting stream buffer size: %lu\n", k);
                 }
                 hdfs_fa.stream_buffer_size = (int32_t)k;
             }
@@ -2912,7 +2735,8 @@ main(int argc, const char *argv[])
             HDfree(props_src);
 #endif /* H5_HAVE_LIBHDFS */
 
-        } else if('-'!=argv[argno][1]) {
+        }
+        else if('-'!=argv[argno][1]) {
             /* Single-letter switches */
             for(s = argv[argno] + 1; *s; s++) {
                 switch(*s) {
@@ -2982,7 +2806,8 @@ main(int argc, const char *argv[])
                         leave(EXIT_FAILURE);
                 } /* end switch */
             } /* end for */
-        } else {
+        }
+        else {
             HDfprintf(stderr, "Unknown argument: %s\n", argv[argno]);
             usage();
             leave(EXIT_FAILURE);
@@ -2991,14 +2816,13 @@ main(int argc, const char *argv[])
 
     /* If no arguments remain then print a usage message (instead of doing
      * absolutely nothing ;-) */
-    if(argno >= argc) {
+    if (argno >= argc) {
         usage();
         leave(EXIT_FAILURE);
     } /* end if */
 
     /* Check for conflicting arguments */
-    if (!is_valid_args())
-    {
+    if (!is_valid_args()) {
         usage();
         leave(EXIT_FAILURE);
     }
@@ -3008,15 +2832,15 @@ main(int argc, const char *argv[])
 
         if (!HDstrcmp(preferred_driver, "ros3")) {
 #ifndef H5_HAVE_ROS3_VFD
-            HDfprintf(rawerrorstream,
-                      "Error: Read-Only S3 VFD not enabled.\n\n");
+            HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD not enabled.\n\n");
             usage();
             leave(EXIT_FAILURE);
 #else
             conf_fa = (void *)&ros3_fa;
 #endif /* H5_HAVE_ROS3_VFD */
 
-        } else if (!HDstrcmp(preferred_driver, "hdfs")) {
+        }
+        else if (!HDstrcmp(preferred_driver, "hdfs")) {
 #ifndef H5_HAVE_LIBHDFS
             PRINTVALSTREAM(rawoutstream, "The HDFS VFD is not enabled.\n");
             leave(EXIT_FAILURE);
@@ -3029,17 +2853,11 @@ main(int argc, const char *argv[])
             HDassert(fapl_id == H5P_DEFAULT);
             fapl_id = H5Pcreate(H5P_FILE_ACCESS);
             if (fapl_id < 0) {
-                HDfprintf(rawerrorstream,
-                          "Error: Unable to create fapl entry\n\n");
+                HDfprintf(rawerrorstream, "Error: Unable to create fapl entry\n\n");
                 leave(EXIT_FAILURE);
             }
-            if (0 == h5tools_set_configured_fapl(
-                    fapl_id,
-                    preferred_driver,
-                    conf_fa))
-            {
-                HDfprintf(rawerrorstream,
-                          "Error: Unable to set fapl\n\n");
+            if (0 == h5tools_set_configured_fapl(fapl_id, preferred_driver, conf_fa)) {
+                HDfprintf(rawerrorstream, "Error: Unable to set fapl\n\n");
                 usage();
                 leave(EXIT_FAILURE);
             }
@@ -3074,7 +2892,7 @@ main(int argc, const char *argv[])
         oname = NULL;
         file = -1;
 
-        while(fname && *fname) {
+        while (fname && *fname) {
             if (fapl_id != H5P_DEFAULT) {
                 file = H5Fopen(fname, H5F_ACC_RDONLY, fapl_id);
             } 
@@ -3082,8 +2900,8 @@ main(int argc, const char *argv[])
                 file = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, preferred_driver, drivername, sizeof drivername);
             }
 
-            if(file >= 0) {
-                if(verbose_g)
+            if (file >= 0) {
+                if (verbose_g)
                     PRINTSTREAM(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername);
                 break; /*success*/
             } /* end if */
@@ -3091,27 +2909,27 @@ main(int argc, const char *argv[])
             /* Shorten the file name; lengthen the object name */
             x = oname;
             oname = HDstrrchr(fname, '/');
-            if(x)
+            if (x)
                 *x = '/';
-            if(!oname)
+            if (!oname)
                 break;
             *oname = '\0';
         } /* end while */
 
-        if(file < 0) {
+        if (file < 0) {
             HDfprintf(rawerrorstream, "%s: unable to open file\n", argv[argno-1]);
             HDfree(fname);
             err_exit = 1;
             continue;
         } /* end if */
-        if(oname) {
+        if (oname) {
             /* Always use absolute paths to avoid confusion, keep track of where
              * to begin path name output */
             *oname = '/';
             iter.base_len = HDstrlen(oname);
             iter.base_len -= oname[iter.base_len-1] == '/';
             x = oname;
-            if(NULL == (oname = HDstrdup(oname))) {
+            if (NULL == (oname = HDstrdup(oname))) {
                 HDfprintf(rawerrorstream, "memory allocation failed\n");
                 leave(EXIT_FAILURE);
             }
@@ -3120,9 +2938,9 @@ main(int argc, const char *argv[])
              * is displayed if it is a link or non-group object */
             iter.name_start = 1;
         }
-        if(!oname || !*oname) {
+        if (!oname || !*oname) {
             oname = root_name;
-            if(recursive_g)
+            if (recursive_g)
                 display_root_g = TRUE;
             iter.base_len = 0;
             iter.name_start = 0;
@@ -3143,9 +2961,9 @@ main(int argc, const char *argv[])
         symlink_list.objs = NULL;
 
         /* Check for root group as object name */
-        if(HDstrcmp(oname, root_name)) {
+        if (HDstrcmp(oname, root_name)) {
             /* Check the type of link given */
-            if(H5Lget_info(file, oname, &li, H5P_DEFAULT) < 0) {
+            if (H5Lget_info(file, oname, &li, H5P_DEFAULT) < 0) {
                 hsize_t             curr_pos = 0;        /* total data element position   */
                 h5tools_str_t       buffer;          /* string into which to render   */
                 h5tools_context_t   ctx;             /* print context  */
@@ -3164,8 +2982,8 @@ main(int argc, const char *argv[])
             li.type = H5L_TYPE_HARD;
 
         /* Open the object and display it's information */
-        if(li.type == H5L_TYPE_HARD) {
-            if(visit_obj(file, oname, &iter) < 0)
+        if (li.type == H5L_TYPE_HARD) {
+            if (visit_obj(file, oname, &iter) < 0)
                 leave(EXIT_FAILURE);
         } /* end if(li.type == H5L_TYPE_HARD) */
         else {
@@ -3176,11 +2994,10 @@ main(int argc, const char *argv[])
         }
         H5Fclose(file);
         HDfree(fname);
-        if(x)
+        if (x)
             HDfree(oname);
 
-        for(u=0; u < symlink_list.nused; u++)
-        {
+        for (u = 0; u < symlink_list.nused; u++) {
             if (symlink_list.objs[u].type == H5L_TYPE_EXTERNAL)
                 HDfree(symlink_list.objs[u].file);
 
@@ -3195,8 +3012,7 @@ main(int argc, const char *argv[])
 
     if (fapl_id != H5P_DEFAULT) {
         if (0 < H5Pclose(fapl_id)) {
-            HDfprintf(rawerrorstream,
-                      "Error: Unable to set close fapl entry\n\n");
+            HDfprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n");
             leave(EXIT_FAILURE);
         }
     }