Add HD prefix to tests

3 files changed, 571 insertions, 532 deletions

diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index 088e6e9..96d6b9f 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -21,19 +21,19 @@
  *
  *-------------------------------------------------------------------------
  */
-#define H5A_FRIEND		/*suppress error about including H5Apkg  */
-#define H5B2_FRIEND		/*suppress error about including H5B2pkg */
-#define H5B2_TESTING		/*suppress warning about H5B2 testing funcs*/
-#define H5D_FRIEND		/*suppress error about including H5Dpkg  */
-#define H5EA_FRIEND		/*suppress error about including H5EApkg */
-#define H5EA_TESTING		/*suppress warning about H5EA testing funcs*/
-#define H5FA_FRIEND		/*suppress error about including H5FApkg */
-#define H5FA_TESTING		/*suppress warning about H5FA testing funcs*/
-#define H5F_FRIEND		/*suppress error about including H5Fpkg  */
-#define H5G_FRIEND		/*suppress error about including H5Gpkg  */
-#define H5HF_FRIEND		/*suppress error about including H5HFpkg */
-#define H5O_FRIEND		/*suppress error about including H5Opkg  */
-#define H5SM_FRIEND		/*suppress error about including H5SMpkg */
+#define H5A_FRIEND        /*suppress error about including H5Apkg  */
+#define H5B2_FRIEND        /*suppress error about including H5B2pkg */
+#define H5B2_TESTING        /*suppress warning about H5B2 testing funcs*/
+#define H5D_FRIEND        /*suppress error about including H5Dpkg  */
+#define H5EA_FRIEND        /*suppress error about including H5EApkg */
+#define H5EA_TESTING        /*suppress warning about H5EA testing funcs*/
+#define H5FA_FRIEND        /*suppress error about including H5FApkg */
+#define H5FA_TESTING        /*suppress warning about H5FA testing funcs*/
+#define H5F_FRIEND        /*suppress error about including H5Fpkg  */
+#define H5G_FRIEND        /*suppress error about including H5Gpkg  */
+#define H5HF_FRIEND        /*suppress error about including H5HFpkg */
+#define H5O_FRIEND        /*suppress error about including H5Opkg  */
+#define H5SM_FRIEND        /*suppress error about including H5SMpkg */
 
 #include "H5private.h"  /* Generic Functions    */
 #include "H5Apkg.h"     /* Attributes           */
@@ -57,7 +57,7 @@
 
 #define VCOL    50
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5B2_class
  *
@@ -80,68 +80,68 @@ get_H5B2_class(const uint8_t *sig)
     const H5B2_class_t *cls;
 
     switch(subtype) {
-        case H5B2_TEST_ID:
-            cls = H5B2_TEST;
-            break;
+    case H5B2_TEST_ID:
+        cls = H5B2_TEST;
+        break;
 
-        case H5B2_FHEAP_HUGE_INDIR_ID:
-            cls = H5HF_HUGE_BT2_INDIR;
-            break;
+    case H5B2_FHEAP_HUGE_INDIR_ID:
+        cls = H5HF_HUGE_BT2_INDIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
-            cls = H5HF_HUGE_BT2_FILT_INDIR;
-            break;
+    case H5B2_FHEAP_HUGE_FILT_INDIR_ID:
+        cls = H5HF_HUGE_BT2_FILT_INDIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_DIR_ID:
-            cls = H5HF_HUGE_BT2_DIR;
-            break;
+    case H5B2_FHEAP_HUGE_DIR_ID:
+        cls = H5HF_HUGE_BT2_DIR;
+        break;
 
-        case H5B2_FHEAP_HUGE_FILT_DIR_ID:
-            cls = H5HF_HUGE_BT2_FILT_DIR;
-            break;
+    case H5B2_FHEAP_HUGE_FILT_DIR_ID:
+        cls = H5HF_HUGE_BT2_FILT_DIR;
+        break;
 
-        case H5B2_GRP_DENSE_NAME_ID:
-            cls = H5G_BT2_NAME;
-            break;
+    case H5B2_GRP_DENSE_NAME_ID:
+        cls = H5G_BT2_NAME;
+        break;
 
-        case H5B2_GRP_DENSE_CORDER_ID:
-            cls = H5G_BT2_CORDER;
-            break;
+    case H5B2_GRP_DENSE_CORDER_ID:
+        cls = H5G_BT2_CORDER;
+        break;
 
-        case H5B2_SOHM_INDEX_ID:
-            cls = H5SM_INDEX;
-            break;
+    case H5B2_SOHM_INDEX_ID:
+        cls = H5SM_INDEX;
+        break;
 
-        case H5B2_ATTR_DENSE_NAME_ID:
-            cls = H5A_BT2_NAME;
-            break;
+    case H5B2_ATTR_DENSE_NAME_ID:
+        cls = H5A_BT2_NAME;
+        break;
 
-        case H5B2_ATTR_DENSE_CORDER_ID:
-            cls = H5A_BT2_CORDER;
-            break;
+    case H5B2_ATTR_DENSE_CORDER_ID:
+        cls = H5A_BT2_CORDER;
+        break;
 
-        case H5B2_CDSET_ID:
-            cls = H5D_BT2;
-            break;
+    case H5B2_CDSET_ID:
+        cls = H5D_BT2;
+        break;
 
-        case H5B2_CDSET_FILT_ID:
-            cls = H5D_BT2_FILT;
-            break;
+    case H5B2_CDSET_FILT_ID:
+        cls = H5D_BT2_FILT;
+        break;
 
-        case H5B2_TEST2_ID:
-            cls = H5B2_TEST2;
-            break;
+    case H5B2_TEST2_ID:
+        cls = H5B2_TEST2;
+        break;
 
-        case H5B2_NUM_BTREE_ID:
-        default:
-            HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
-            HDexit(4);
+    case H5B2_NUM_BTREE_ID:
+    default:
+        HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5B2_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5EA_class
  *
@@ -164,28 +164,28 @@ get_H5EA_class(const uint8_t *sig)
     const H5EA_class_t *cls;
 
     switch(clsid) {
-        case H5EA_CLS_TEST_ID:
-            cls = H5EA_CLS_TEST;
-            break;
+    case H5EA_CLS_TEST_ID:
+        cls = H5EA_CLS_TEST;
+        break;
 
-        case H5EA_CLS_CHUNK_ID:
-            cls = H5EA_CLS_CHUNK;
-            break;
+    case H5EA_CLS_CHUNK_ID:
+        cls = H5EA_CLS_CHUNK;
+        break;
 
-        case H5EA_CLS_FILT_CHUNK_ID:
-            cls = H5EA_CLS_FILT_CHUNK;
-            break;
+    case H5EA_CLS_FILT_CHUNK_ID:
+        cls = H5EA_CLS_FILT_CHUNK;
+        break;
 
-        case H5EA_NUM_CLS_ID:
-        default:
-            HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
-            HDexit(4);
+    case H5EA_NUM_CLS_ID:
+    default:
+        HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5EA_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    get_H5FA_class
  *
@@ -208,28 +208,28 @@ get_H5FA_class(const uint8_t *sig)
     const H5FA_class_t *cls;
 
     switch(clsid) {
-        case H5FA_CLS_TEST_ID:
-            cls = H5FA_CLS_TEST;
-            break;
+    case H5FA_CLS_TEST_ID:
+        cls = H5FA_CLS_TEST;
+        break;
 
-        case H5FA_CLS_CHUNK_ID:
-            cls = H5FA_CLS_CHUNK;
-            break;
+    case H5FA_CLS_CHUNK_ID:
+        cls = H5FA_CLS_CHUNK;
+        break;
 
-        case H5FA_CLS_FILT_CHUNK_ID:
-            cls = H5FA_CLS_FILT_CHUNK;
-            break;
+    case H5FA_CLS_FILT_CHUNK_ID:
+        cls = H5FA_CLS_FILT_CHUNK;
+        break;
 
-        case H5FA_NUM_CLS_ID: 
-        default:
-            HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
-            HDexit(4);
+    case H5FA_NUM_CLS_ID:
+    default:
+        HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid));
+        HDexit(4);
     } /* end switch */
 
     return(cls);
 } /* end get_H5FA_class() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -254,13 +254,13 @@ main(int argc, char *argv[])
     uint8_t     sig[H5F_SIGNATURE_LEN];
     size_t      u;
     H5E_auto2_t func;
-    void 	*edata;
+    void     *edata;
     hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
     herr_t      status = SUCCEED;
 
     if(argc == 1) {
-  	HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
-  	HDexit(1);
+        HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+        HDexit(1);
     } /* end if */
 
     /* Initialize the library */
@@ -274,15 +274,15 @@ main(int argc, char *argv[])
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /*
-     * Open the file and get the file descriptor.
-     */
+    * Open the file and get the file descriptor.
+    */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
         HDfprintf(stderr, "cannot create file access property list\n");
         HDexit(1);
     } /* end if */
     if(HDstrchr(argv[1], '%'))
         if(H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT) < 0) {
-            fprintf(stderr, "cannot set file access property list\n");
+            HDfprintf(stderr, "cannot set file access property list\n");
             HDexit(1);
         }
     if((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
@@ -309,8 +309,8 @@ main(int argc, char *argv[])
     }
 
     /*
-     * Parse command arguments.
-     */
+    * Parse command arguments.
+    */
     if(argc > 2)
         addr = (haddr_t)HDstrtoll(argv[2], NULL, 0);
     if(argc > 3)
@@ -323,8 +323,8 @@ main(int argc, char *argv[])
         extra4 = (haddr_t)HDstrtoll(argv[6], NULL, 0);
 
     /*
-     * Read the signature at the specified file position.
-     */
+    * Read the signature at the specified file position.
+    */
     HDfprintf(stdout, "Reading signature at address %a (rel)\n", addr);
     if(H5F_block_read(f, H5FD_MEM_SUPER, addr, sizeof(sig), sig) < 0) {
         HDfprintf(stderr, "cannot read signature\n");
@@ -332,26 +332,28 @@ main(int argc, char *argv[])
     }
     if(!HDmemcmp(sig, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) {
         /*
-         * Debug the file's super block.
-         */
+        * Debug the file's super block.
+        */
         status = H5F_debug(f, stdout, 0, VCOL);
 
     } else if(!HDmemcmp(sig, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a local heap.
-         */
+        * Debug a local heap.
+        */
         status = H5HL_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
-	/*
-	 * Debug a global heap collection.
-	 */
-	status = H5HG_debug(f, addr, stdout, 0, VCOL);
+    }
+    else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+        /*
+        * Debug a global heap collection.
+        */
+        status = H5HG_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a symbol table node.
-         */
+        * Debug a symbol table node.
+        */
 
         /* Check for extra parameters */
         if(extra == 0) {
@@ -362,107 +364,109 @@ main(int argc, char *argv[])
 
         status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
 
-    } else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a B-tree.  B-trees are debugged through the B-tree
-         * subclass.  The subclass identifier is the byte immediately
-         * after the B-tree signature.
-         */
+        * Debug a B-tree.  B-trees are debugged through the B-tree
+        * subclass.  The subclass identifier is the byte immediately
+        * after the B-tree signature.
+        */
         H5B_subid_t subtype = (H5B_subid_t)sig[H5_SIZEOF_MAGIC];
         unsigned    ndims;
         uint32_t    dim[H5O_LAYOUT_NDIMS];
 
         switch(subtype) {
-            case H5B_SNODE_ID:
-                /* Check for extra parameters */
-                if(extra == 0) {
-                    HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
-                    HDfprintf(stderr, "B-tree symbol table node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
-                    HDexit(4);
-                } /* end if */
+        case H5B_SNODE_ID:
+            /* Check for extra parameters */
+            if(extra == 0) {
+                HDfprintf(stderr, "\nWarning: Providing the group's local heap address will give more information\n");
+                HDfprintf(stderr, "B-tree symbol table node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n");
+                HDexit(4);
+            } /* end if */
 
-                status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
-                break;
+            status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra);
+            break;
 
-            case H5B_CHUNK_ID:
-                /* Check for extra parameters */
-                if(extra == 0) {
-                    HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+        case H5B_CHUNK_ID:
+            /* Check for extra parameters */
+            if(extra == 0) {
+                HDfprintf(stderr, "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n");
+                HDfprintf(stderr, "B-tree chunked storage node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
+                HDexit(4);
+            } /* end if */
+
+            /* Build array of chunk dimensions */
+            ndims = (unsigned)extra;
+            dim[0] = (uint32_t)extra2;
+            if(ndims > 1)
+                dim[1] = (uint32_t)extra3;
+            if(ndims > 2)
+                dim[2] = (uint32_t)extra4;
+
+            /* Check for dimension error */
+            if(ndims > 3) {
+                HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
+                HDfprintf(stderr, "B-tree chunked storage node usage:\n");
+                HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
+                HDexit(4);
+            } /* end for */
+            for(u = 0; u < ndims; u++)
+                if(0 == dim[u]) {
+                    HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
                     HDfprintf(stderr, "B-tree chunked storage node usage:\n");
                     HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
                     HDexit(4);
                 } /* end if */
 
-                /* Build array of chunk dimensions */
-                ndims = (unsigned)extra;
-                dim[0] = (uint32_t)extra2;
-                if(ndims > 1)
-                    dim[1] = (uint32_t)extra3;
-                if(ndims > 2)
-                    dim[2] = (uint32_t)extra4;
-
-                /* Check for dimension error */
-                if(ndims > 3) {
-                    HDfprintf(stderr, "ERROR: Only 3 dimensions support currently (fix h5debug)\n");
-                    HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                    HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                    HDexit(4);
-                } /* end for */
-                for(u = 0; u < ndims; u++)
-                    if(0 == dim[u]) {
-                        HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n");
-                        HDfprintf(stderr, "B-tree chunked storage node usage:\n");
-                        HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest chunk dim>...<fastest chunk dim>\n");
-                        HDexit(4);
-                    } /* end if */
-
-                /* Set the last dimension (the element size) to zero */
-                dim[ndims] = 0;
-
-                status = H5D_btree_debug(f, addr, stdout, 0, VCOL, ndims, dim);
-                break;
-
-            case H5B_NUM_BTREE_ID:
-            default:
-                HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
-                HDexit(4);
+            /* Set the last dimension (the element size) to zero */
+            dim[ndims] = 0;
+
+            status = H5D_btree_debug(f, addr, stdout, 0, VCOL, ndims, dim);
+            break;
+
+        case H5B_NUM_BTREE_ID:
+        default:
+            HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype));
+            HDexit(4);
         }
 
-    } else if(!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a v2 B-tree header.
-         */
+        * Debug a v2 B-tree header.
+        */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
-	    if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && extra == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the layout message in order to dump header\n");
             HDfprintf(stderr, "v2 B-tree hdr usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n");
             HDexit(4);
-	    } /* end if */
+        } /* end if */
 
         status = H5B2__hdr_debug(f, addr, stdout, 0, VCOL, cls, (haddr_t)extra);
 
-    } else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a v2 B-tree internal node.
-         */
+        * Debug a v2 B-tree internal node.
+        */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
         /* Check for enough valid parameters */
-	if((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
-	   (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
-
-            fprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
-            fprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
-            fprintf(stderr, "v2 B-tree internal node usage:\n");
-            fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 || extra4 == 0)) {
+            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object header address containing the layout message in order to dump internal node\n");
+            HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
+            HDfprintf(stderr, "v2 B-tree internal node usage:\n");
+            HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> <number of records> <depth> <object header address>\n");
             HDexit(4);
 
-        } else if(extra == 0 || extra2 == 0 || extra3 == 0) {
+        }
+        else if(extra == 0 || extra2 == 0 || extra3 == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and depth in order to dump internal node\n");
             HDfprintf(stderr, "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n");
             HDfprintf(stderr, "v2 B-tree internal node usage:\n");
@@ -472,23 +476,24 @@ main(int argc, char *argv[])
 
         status = H5B2__int_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (unsigned)extra3, (haddr_t)extra4);
 
-    } else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a v2 B-tree leaf node.
-         */
+        * Debug a v2 B-tree leaf node.
+        */
         const H5B2_class_t *cls = get_H5B2_class(sig);
         HDassert(cls);
 
         /* Check for enough valid parameters */
-	if((cls == H5D_BT2 || cls == H5D_BT2_FILT) &&
-	   (extra == 0 || extra2 == 0 || extra3 == 0 )) {
+        if((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra == 0 || extra2 == 0 || extra3 == 0 )) {
 
-            fprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
-            fprintf(stderr, "v2 B-tree leaf node usage:\n");
-            fprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
+            HDfprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header address containing the layout message in order to dump leaf node\n");
+            HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
+            HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records> <object header address>\n");
             HDexit(4);
 
-        } else if(extra == 0 || extra2 == 0) {
+        }
+        else if(extra == 0 || extra2 == 0) {
             HDfprintf(stderr, "ERROR: Need v2 B-tree header address and number of records in order to dump leaf node\n");
             HDfprintf(stderr, "v2 B-tree leaf node usage:\n");
             HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records>\n");
@@ -497,16 +502,18 @@ main(int argc, char *argv[])
 
         status = H5B2__leaf_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, (haddr_t)extra3);
 
-    } else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fractal heap header.
-         */
+        * Debug a fractal heap header.
+        */
         status = H5HF_hdr_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fractal heap direct block.
-         */
+        * Debug a fractal heap direct block.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0 || extra2 == 0) {
@@ -518,10 +525,11 @@ main(int argc, char *argv[])
 
         status = H5HF_dblock_debug(f, addr, stdout, 0, VCOL, extra, (size_t)extra2);
 
-    } else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fractal heap indirect block.
-         */
+        * Debug a fractal heap indirect block.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0 || extra2 == 0) {
@@ -533,17 +541,19 @@ main(int argc, char *argv[])
 
         status = H5HF_iblock_debug(f, addr, stdout, 0, VCOL, extra, (unsigned)extra2);
 
-    } else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a free space header.
-         */
+        * Debug a free space header.
+        */
 
         status = H5FS_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug free space serialized sections.
-         */
+        * Debug free space serialized sections.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0 || extra2 == 0) {
@@ -555,17 +565,19 @@ main(int argc, char *argv[])
 
         status = H5FS_sects_debug(f, addr, stdout, 0, VCOL, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug shared message master table.
-         */
+        * Debug shared message master table.
+        */
 
         status = H5SM_table_debug(f, addr, stdout, 0, VCOL, (unsigned) UFAIL, (unsigned) UFAIL);
 
-    } else if(!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug shared message list index.
-         */
+        * Debug shared message list index.
+        */
 
         /* Check for enough valid parameters */
         if(extra == 0) {
@@ -577,10 +589,11 @@ main(int argc, char *argv[])
 
         status = H5SM_list_debug(f, addr, stdout, 0, VCOL, (haddr_t)extra);
 
-    } else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray header.
-         */
+        * Debug an extensible aray header.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -594,10 +607,11 @@ main(int argc, char *argv[])
 
         status = H5EA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
 
-    } else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray index block.
-         */
+        * Debug an extensible aray index block.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -611,10 +625,11 @@ main(int argc, char *argv[])
 
         status = H5EA__iblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray super block.
-         */
+        * Debug an extensible aray super block.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -628,10 +643,11 @@ main(int argc, char *argv[])
 
         status = H5EA__sblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (unsigned)extra2, extra3);
 
-    } else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug an extensible aray data block.
-         */
+        * Debug an extensible aray data block.
+        */
         const H5EA_class_t *cls = get_H5EA_class(sig);
         HDassert(cls);
 
@@ -645,10 +661,11 @@ main(int argc, char *argv[])
 
         status = H5EA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, (size_t)extra2, extra3);
 
-    } else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fixed array header.
-         */
+        * Debug a fixed array header.
+        */
         const H5FA_class_t *cls = get_H5FA_class(sig);
         HDassert(cls);
 
@@ -662,10 +679,11 @@ main(int argc, char *argv[])
 
         status = H5FA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra);
 
-    } else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug a fixed array data block.
-         */
+        * Debug a fixed array data block.
+        */
         const H5FA_class_t *cls = get_H5FA_class(sig);
         HDassert(cls);
 
@@ -679,33 +697,37 @@ main(int argc, char *argv[])
 
         status = H5FA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra, extra2);
 
-    } else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
+    }
+    else if(!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
         /*
-         * Debug v2 object header (which have signatures).
-         */
+        * Debug v2 object header (which have signatures).
+        */
 
         status = H5O_debug(f, addr, stdout, 0, VCOL);
 
-    } else if(sig[0] == H5O_VERSION_1) {
+    }
+    else if(sig[0] == H5O_VERSION_1) {
         /*
-         * This could be a v1 object header.  Since they don't have a signature
-         * it's a somewhat "ify" detection.
-         */
+        * This could be a v1 object header.  Since they don't have a signature
+        * it's a somewhat "ify" detection.
+        */
         status = H5O_debug(f, addr, stdout, 0, VCOL);
 
-    } else {
+    }
+    else {
         /*
-         * Got some other unrecognized signature.
-         */
-        printf("%-*s ", VCOL, "Signature:");
+        * Got some other unrecognized signature.
+        */
+        HDprintf("%-*s ", VCOL, "Signature:");
         for (u = 0; u < sizeof(sig); u++) {
             if (sig[u] > ' ' && sig[u] <= '~' && '\\' != sig[u])
                 HDputchar(sig[u]);
             else if ('\\' == sig[u]) {
                 HDputchar('\\');
                 HDputchar('\\');
-            } else
-                printf("\\%03o", sig[u]);
+            }
+            else
+                HDprintf("\\%03o", sig[u]);
         }
         HDputchar('\n');
 
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index b7ff73c..feb60d4 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -251,7 +251,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
+            HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname());
     } /* end if */
 
     /* Attempt to open an existing HDF5 file first */
@@ -284,7 +284,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: Creating parent groups\n", h5tools_getprogname());
+            HDprintf("%s: Creating parent groups\n", h5tools_getprogname());
     } /* end if */
 
     /* Loop over creating requested groups */
@@ -305,7 +305,7 @@ main(int argc, const char *argv[])
 
         /* Display some output if requested */
         if(params.verbose)
-            printf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
+            HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params.groups[curr_group]);
     } /* end for */
 
     /* Close link creation property list */
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index 2f4d93e..d516fa0 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -15,19 +15,19 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Wednesday, May 13, 1998
  *
- * Purpose:	Repartitions a file family.  This program can be used to
- *		split a single file into a family of files, join a family of
- *		files into a single file, or copy one family to another while
- *		changing the size of the family members.  It can also be used
- *		to copy a single file to a single file with holes.
+ * Purpose:    Repartitions a file family.  This program can be used to
+ *        split a single file into a family of files, join a family of
+ *        files into a single file, or copy one family to another while
+ *        changing the size of the family members.  It can also be used
+ *        to copy a single file to a single file with holes.
  */
 
 /* See H5private.h for how to include system headers */
 #include "hdf5.h"
 #include "H5private.h"
 
-#define NAMELEN	4096
-#define GB	*1024*1024*1024
+#define NAMELEN    4096
+#define GB    *1024*1024*1024
 
 /* Make these 2 private properties(defined in H5Fprivate.h) available to h5repart.
  * The first one updates the member file size in the superblock.  The second one
@@ -36,15 +36,15 @@
 #define H5F_ACS_FAMILY_NEWSIZE_NAME            "family_newsize"
 #define H5F_ACS_FAMILY_TO_SINGLE_NAME          "family_to_single"
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	usage
+ * Function:    usage
  *
- * Purpose:	Prints a usage message.
+ * Purpose:    Prints a usage message.
  *
- * Return:	void
+ * Return:    void
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Modifications:
@@ -54,98 +54,99 @@
 static void
 usage (const char *progname)
 {
-    fprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n",
-	    progname);
-    fprintf(stderr, "   -v     Produce verbose output\n");
-    fprintf(stderr, "   -V     Print a version number and exit\n");
-    fprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
-    fprintf(stderr, "   -m N   The destination member size or 1GB\n");
-    fprintf(stderr, "   -family_to_sec2   Deprecated version of -family_to_single (below)\n");
-    fprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD (windows or sec2)\n");
-    fprintf(stderr, "   SRC    The name of the source file\n");
-    fprintf(stderr, "   DST	The name of the destination files\n");
-    fprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
-	    "`k' for kB.\n");
-    fprintf(stderr, "File family names include an integer printf "
-	    "format such as `%%d'\n");
-    exit (EXIT_FAILURE);
+    HDfprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n",
+        progname);
+    HDfprintf(stderr, "   -v     Produce verbose output\n");
+    HDfprintf(stderr, "   -V     Print a version number and exit\n");
+    HDfprintf(stderr, "   -b N   The I/O block size, defaults to 1kB\n");
+    HDfprintf(stderr, "   -m N   The destination member size or 1GB\n");
+    HDfprintf(stderr, "   -family_to_sec2   Deprecated version of -family_to_single (below)\n");
+    HDfprintf(stderr, "   -family_to_single   Change file driver from family to the default single-file VFD (windows or sec2)\n");
+    HDfprintf(stderr, "   SRC    The name of the source file\n");
+    HDfprintf(stderr, "   DST    The name of the destination files\n");
+    HDfprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
+        "`k' for kB.\n");
+    HDfprintf(stderr, "File family names include an integer printf "
+        "format such as `%%d'\n");
+    HDexit (EXIT_FAILURE);
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	get_size
+ * Function:    get_size
  *
- * Purpose:	Reads a size option of the form `-XNS' where `X' is any
- *		letter, `N' is a multi-character positive decimal number, and
- *		`S' is an optional suffix letter in the set [GgMmk].  The
- *		option may also be split among two arguments as: `-X NS'.
- *		The input value of ARGNO is the argument number for the
- *		switch in the ARGV vector and ARGC is the number of entries
- *		in that vector.
+ * Purpose:    Reads a size option of the form `-XNS' where `X' is any
+ *        letter, `N' is a multi-character positive decimal number, and
+ *        `S' is an optional suffix letter in the set [GgMmk].  The
+ *        option may also be split among two arguments as: `-X NS'.
+ *        The input value of ARGNO is the argument number for the
+ *        switch in the ARGV vector and ARGC is the number of entries
+ *        in that vector.
  *
- * Return:	Success:	The value N multiplied according to the
- *				suffix S.  On return ARGNO will be the number
- *				of the next argument to process.
+ * Return:    Success:    The value N multiplied according to the
+ *                suffix S.  On return ARGNO will be the number
+ *                of the next argument to process.
  *
- *		Failure:	Calls usage() which exits with a non-zero
- *				status.
+ *        Failure:    Calls usage() which exits with a non-zero
+ *                status.
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static off_t
 get_size (const char *progname, int *argno, int argc, char *argv[])
 {
-    off_t	retval=-1;
-    char	*suffix;
+    off_t    retval=-1;
+    char    *suffix;
 
     if (isdigit ((int)(argv[*argno][2]))) {
-	retval = strtol (argv[*argno]+2, &suffix, 10);
-	(*argno)++;
-    } else if (argv[*argno][2] || *argno+1>=argc) {
-	usage (progname);
-    } else {
-	retval = strtol (argv[*argno+1], &suffix, 0);
-	if (suffix==argv[*argno+1]) usage (progname);
-	*argno += 2;
+        retval = HDstrtol(argv[*argno]+2, &suffix, 10);
+        (*argno)++;
+    }
+    else if (argv[*argno][2] || *argno+1>=argc) {
+        usage (progname);
+    }
+    else {
+        retval = HDstrtol(argv[*argno+1], &suffix, 0);
+        if (suffix == argv[*argno+1])
+            usage (progname);
+        *argno += 2;
     }
     if (suffix && suffix[0] && !suffix[1]) {
-	switch (*suffix) {
-	case 'G':
-	case 'g':
-	    retval *= 1024 * 1024 * 1024;
-	    break;
-	case 'M':
-	case 'm':
-	    retval *= 1024 * 1024;
-	    break;
-	case 'k':
-	    retval *= 1024;
-	    break;
-	default:
-	    usage (progname);
-	}
-    } else if (suffix && suffix[0]) {
-	usage (progname);
+        switch (*suffix) {
+        case 'G':
+        case 'g':
+            retval *= 1024 * 1024 * 1024;
+            break;
+        case 'M':
+        case 'm':
+            retval *= 1024 * 1024;
+            break;
+        case 'k':
+            retval *= 1024;
+            break;
+        default:
+            usage(progname);
+        }
+    }
+    else if (suffix && suffix[0]) {
+        usage (progname);
     }
     return retval;
 }
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	main
+ * Function:    main
  *
- * Purpose:	Split an hdf5 file
+ * Purpose:    Split an hdf5 file
  *
- * Return:	Success:
+ * Return:    Success:
  *
- *		Failure:
+ *        Failure:
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, May 13, 1998
  *
  * Modifications:
@@ -155,36 +156,36 @@ get_size (const char *progname, int *argno, int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-    const char	*prog_name;		/*program name			*/
-    size_t	blk_size=1024;		/*size of each I/O block	*/
-    char	*buf=NULL;		/*I/O block buffer		*/
-    size_t	n, i;			/*counters			*/
-    ssize_t	nio;			/*I/O return value		*/
-    int		argno=1;		/*program argument number	*/
-    int		src, dst=-1;		/*source & destination files	*/
-    int		need_seek=FALSE;	/*destination needs to seek?	*/
-    int		need_write;		/*data needs to be written?	*/
-    h5_stat_t sb;                       /*temporary file stat buffer	*/
-
-    int		verbose=FALSE;		/*display file names?		*/
-
-    const char	*src_gen_name;  /*general source name		*/
-    char	*src_name=NULL;	    /*source member name		*/
-
-    int		src_is_family;		/*is source name a family name?	*/
-    int		src_membno=0;		/*source member number		*/
-
-    const char	*dst_gen_name;	/*general destination name	*/
-    char	*dst_name=NULL;	    /*destination member name	*/
-    int		dst_is_family;		/*is dst name a family name?	*/
-    int		dst_membno=0;		/*destination member number	*/
-
-    off_t	left_overs=0;		/*amount of zeros left over	*/
-    off_t	src_offset=0;		/*offset in source member	*/
-    off_t	dst_offset=0;		/*offset in destination member	*/
-    off_t	src_size;           /*source logical member size	*/
-    off_t	src_act_size;		/*source actual member size	*/
-    off_t	dst_size=1 GB;		/*destination logical memb size	*/
+    const char    *prog_name;        /*program name            */
+    size_t    blk_size=1024;        /*size of each I/O block    */
+    char    *buf=NULL;        /*I/O block buffer        */
+    size_t    n, i;            /*counters            */
+    ssize_t    nio;            /*I/O return value        */
+    int        argno=1;        /*program argument number    */
+    int        src, dst=-1;        /*source & destination files    */
+    int        need_seek=FALSE;    /*destination needs to seek?    */
+    int        need_write;        /*data needs to be written?    */
+    h5_stat_t sb;                       /*temporary file stat buffer    */
+
+    int        verbose=FALSE;        /*display file names?        */
+
+    const char    *src_gen_name;  /*general source name        */
+    char    *src_name=NULL;        /*source member name        */
+
+    int        src_is_family;        /*is source name a family name?    */
+    int        src_membno=0;        /*source member number        */
+
+    const char    *dst_gen_name;    /*general destination name    */
+    char    *dst_name=NULL;        /*destination member name    */
+    int        dst_is_family;        /*is dst name a family name?    */
+    int        dst_membno=0;        /*destination member number    */
+
+    off_t    left_overs=0;        /*amount of zeros left over    */
+    off_t    src_offset=0;        /*offset in source member    */
+    off_t    dst_offset=0;        /*offset in destination member    */
+    off_t    src_size;           /*source logical member size    */
+    off_t    src_act_size;        /*source actual member size    */
+    off_t    dst_size=1 GB;        /*destination logical memb size    */
     hid_t       fapl;                   /*file access property list     */
     hid_t       file;
     hsize_t     hdsize;                 /*destination logical memb size */
@@ -193,48 +194,50 @@ main (int argc, char *argv[])
     /*
      * Get the program name from argv[0]. Use only the last component.
      */
-    if ((prog_name=strrchr (argv[0], '/'))) prog_name++;
-    else prog_name = argv[0];
+    if ((prog_name = HDstrrchr (argv[0], '/')))
+        prog_name++;
+    else
+        prog_name = argv[0];
 
     /*
      * Parse switches.
      */
-    while (argno<argc && '-'==argv[argno][0]) {
-        if (!strcmp (argv[argno], "-v")) {
+    while (argno < argc && '-' == argv[argno][0]) {
+        if (!HDstrcmp(argv[argno], "-v")) {
             verbose = TRUE;
             argno++;
-        } else if (!strcmp(argv[argno], "-V")) {
-            printf("This is %s version %u.%u release %u\n",
-                prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
-            exit(EXIT_SUCCESS);
-        } else if (!strcmp (argv[argno], "-family_to_sec2")) {
+        } else if (!HDstrcmp(argv[argno], "-V")) {
+            HDprintf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);
+            HDexit(EXIT_SUCCESS);
+        } else if (!HDstrcmp(argv[argno], "-family_to_sec2")) {
             family_to_single = TRUE;
             argno++;
-        } else if (!strcmp (argv[argno], "-family_to_single")) {
+        } else if (!HDstrcmp(argv[argno], "-family_to_single")) {
             family_to_single = TRUE;
             argno++;
-        } else if ('b'==argv[argno][1]) {
-            blk_size = (size_t)get_size (prog_name, &argno, argc, argv);
-        } else if ('m'==argv[argno][1]) {
-            dst_size = get_size (prog_name, &argno, argc, argv);
+        } else if ('b' == argv[argno][1]) {
+            blk_size = (size_t) get_size(prog_name, &argno, argc, argv);
+        } else if ('m' == argv[argno][1]) {
+            dst_size = get_size(prog_name, &argno, argc, argv);
         } else {
-            usage (prog_name);
+            usage(prog_name);
         } /* end if */
     } /* end while */
 
     /* allocate names */
     if(NULL == (src_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     if(NULL == (dst_name = (char *)HDcalloc((size_t)NAMELEN, sizeof(char))))
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
 
     /*
      * Get the name for the source file and open the first member.  The size
      * of the first member determines the logical size of all the members.
      */
-    if (argno>=argc) usage (prog_name);
+    if (argno >= argc)
+        usage(prog_name);
     src_gen_name = argv[argno++];
-    sprintf (src_name, src_gen_name, src_membno);
+    HDsprintf(src_name, src_gen_name, src_membno);
     src_is_family = strcmp (src_name, src_gen_name);
 
     if ((src = HDopen(src_name, O_RDONLY)) < 0) {
@@ -242,157 +245,170 @@ main (int argc, char *argv[])
         HDexit(EXIT_FAILURE);
     }
 
-    if (HDfstat(src, &sb)<0) {
-        perror ("fstat");
-        exit (EXIT_FAILURE);
+    if (HDfstat(src, &sb) < 0) {
+        HDperror("fstat");
+        HDexit(EXIT_FAILURE);
     }
     src_size = src_act_size = sb.st_size;
-    if (verbose) fprintf (stderr, "< %s\n", src_name);
+    if (verbose)
+        HDfprintf(stderr, "< %s\n", src_name);
 
     /*
      * Get the name for the destination file and open the first member.
      */
-    if (argno>=argc) usage (prog_name);
+    if (argno>=argc)
+        usage (prog_name);
     dst_gen_name = argv[argno++];
-    sprintf (dst_name, dst_gen_name, dst_membno);
-    dst_is_family = strcmp (dst_name, dst_gen_name);
+    HDsprintf(dst_name, dst_gen_name, dst_membno);
+    dst_is_family = HDstrcmp(dst_name, dst_gen_name);
 
     if ((dst = HDopen(dst_name, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
         HDperror(dst_name);
         HDexit(EXIT_FAILURE);
     }
-    if (verbose) fprintf (stderr, "> %s\n", dst_name);
+    if (verbose)
+        HDfprintf(stderr, "> %s\n", dst_name);
 
     /* No more arguments */
-    if (argno<argc) usage (prog_name);
+    if (argno < argc)
+        usage (prog_name);
 
     /* Now the real work, split the file */
     buf = (char *)HDmalloc(blk_size);
     while (src_offset<src_size) {
 
-	/* Read a block.  The amount to read is the minimum of:
-	 *    1. The I/O block size
-	 *    2. What's left to write in the destination member
-	 *    3. Left over zeros or what's left in the source member.
-	 */
-	n = blk_size;
-	if (dst_is_family) n = (size_t)MIN((off_t)n, dst_size-dst_offset);
-	if (left_overs) {
-	    n = (size_t)MIN ((off_t)n, left_overs);
-	    left_overs = left_overs - (off_t)n;
-	    need_write = FALSE;
-	} else if (src_offset<src_act_size) {
-	    n = (size_t)MIN ((off_t)n, src_act_size-src_offset);
-	    if ((nio=HDread (src, buf, n))<0) {
-		perror ("read");
-		exit (EXIT_FAILURE);
-	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short read\n", src_name);
-		exit (EXIT_FAILURE);
-	    }
-	    for (i=0; i<n; i++) {
-		if (buf[i]) break;
-	    }
-	    need_write = (i<n);
-	} else {
-	    n = 0;
-	    left_overs = src_size - src_act_size;
-	    need_write = FALSE;
-	}
-
-	/*
-	 * If the block contains non-zero data then write it to the
-	 * destination, otherwise just remember that we'll have to do a seek
-	 * later in the destination when we finally get non-zero data.
-	 */
-	if (need_write) {
-	    if (need_seek && HDlseek (dst, dst_offset, SEEK_SET)<0) {
-		perror ("HDlseek");
-		exit (EXIT_FAILURE);
-	    }
-	    if ((nio=HDwrite (dst, buf, n))<0) {
-		perror ("write");
-		exit (EXIT_FAILURE);
-	    } else if ((size_t)nio!=n) {
-		fprintf (stderr, "%s: short write\n", dst_name);
-		exit (EXIT_FAILURE);
-	    }
-	    need_seek = FALSE;
-	} else {
-	    need_seek = TRUE;
-	}
-
-	/*
-	 * Update the source offset and open the next source family member if
-	 * necessary.  The source stream ends at the first member which
-	 * cannot be opened because it doesn't exist.  At the end of the
-	 * source stream, update the destination offset and break out of the
-	 * loop.   The destination offset must be updated so we can fix
-	 * trailing holes.
-	 */
-	src_offset = src_offset + (off_t)n;
-	if (src_offset==src_act_size) {
-	    HDclose (src);
-	    if (!src_is_family) {
-                dst_offset = dst_offset + (off_t)n;
-		break;
-	    }
-	    sprintf (src_name, src_gen_name, ++src_membno);
-	    if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
-            dst_offset = dst_offset + (off_t)n;
-            break;
-	    } else if (src<0) {
-		perror (src_name);
-		exit (EXIT_FAILURE);
-	    }
-	    if (HDfstat (src, &sb)<0) {
-		perror ("fstat");
-		exit (EXIT_FAILURE);
-	    }
-	    src_act_size = sb.st_size;
-	    if (src_act_size>src_size) {
-		fprintf (stderr, "%s: member truncated to %lu bytes\n",
-			 src_name, (unsigned long)src_size);
-	    }
-	    src_offset = 0;
-	    if (verbose) fprintf (stderr, "< %s\n", src_name);
-	}
-
-	/*
-	 * Update the destination offset, opening a new member if one will be
-	 * needed. The first member is extended to the logical member size
-	 * but other members might be smaller if they end with a hole.
-	 */
-        dst_offset = dst_offset + (off_t)n;
-	if (dst_is_family && dst_offset==dst_size) {
-	    if (0==dst_membno) {
-		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
-		    perror ("HDHDlseek");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDread (dst, buf, 1)<0) {
-		    perror ("read");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDlseek (dst, dst_size-1, SEEK_SET)<0) {
-		    perror ("HDlseek");
-		    exit (EXIT_FAILURE);
-		}
-		if (HDwrite (dst, buf, 1)<0) {
-		    perror ("write");
-		    exit (EXIT_FAILURE);
-		}
-	    }
-	    HDclose (dst);
-	    sprintf (dst_name, dst_gen_name, ++dst_membno);
-	    if ((dst = HDopen(dst_name, O_RDWR|O_CREAT|O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
-            HDperror(dst_name);
-            HDexit(EXIT_FAILURE);
-	    }
-	    dst_offset = 0;
-	    need_seek = FALSE;
-	    if (verbose) fprintf (stderr, "> %s\n", dst_name);
-	}
+    /* Read a block.  The amount to read is the minimum of:
+    *    1. The I/O block size
+    *    2. What's left to write in the destination member
+    *    3. Left over zeros or what's left in the source member.
+    */
+        n = blk_size;
+        if (dst_is_family)
+            n = (size_t)MIN((off_t)n, dst_size-dst_offset);
+        if (left_overs) {
+            n = (size_t)MIN((off_t)n, left_overs);
+            left_overs = left_overs - (off_t) n;
+            need_write = FALSE;
+        }
+        else if (src_offset < src_act_size) {
+            n = (size_t)MIN((off_t)n, src_act_size-src_offset);
+            if ((nio = HDread(src, buf, n)) < 0) {
+                HDperror("read");
+                HDexit(EXIT_FAILURE);
+            }
+            else if ((size_t) nio != n) {
+                HDfprintf(stderr, "%s: short read\n", src_name);
+                HDexit(EXIT_FAILURE);
+            }
+            for (i = 0; i < n; i++) {
+                if (buf[i])
+                    break;
+            }
+            need_write = (i < n);
+        }
+        else {
+            n = 0;
+            left_overs = src_size - src_act_size;
+            need_write = FALSE;
+        }
+
+    /*
+    * If the block contains non-zero data then write it to the
+    * destination, otherwise just remember that we'll have to do a seek
+    * later in the destination when we finally get non-zero data.
+    */
+        if (need_write) {
+            if (need_seek && HDlseek (dst, dst_offset, SEEK_SET) < 0) {
+                HDperror("HDlseek");
+                HDexit(EXIT_FAILURE);
+            }
+            if ((nio = HDwrite(dst, buf, n)) < 0) {
+                HDperror("write");
+                HDexit(EXIT_FAILURE);
+            }
+            else if ((size_t) nio != n) {
+                HDfprintf(stderr, "%s: short write\n", dst_name);
+                HDexit(EXIT_FAILURE);
+            }
+            need_seek = FALSE;
+        }
+        else {
+            need_seek = TRUE;
+        }
+
+    /*
+    * Update the source offset and open the next source family member if
+    * necessary.  The source stream ends at the first member which
+    * cannot be opened because it doesn't exist.  At the end of the
+    * source stream, update the destination offset and break out of the
+    * loop.   The destination offset must be updated so we can fix
+    * trailing holes.
+    */
+        src_offset = src_offset + (off_t) n;
+        if (src_offset == src_act_size) {
+            HDclose(src);
+            if (!src_is_family) {
+                dst_offset = dst_offset + (off_t) n;
+                break;
+            }
+            HDsprintf(src_name, src_gen_name, ++src_membno);
+            if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
+                dst_offset = dst_offset + (off_t) n;
+                break;
+            }
+            else if (src < 0) {
+                HDperror(src_name);
+                HDexit(EXIT_FAILURE);
+            }
+            if (HDfstat (src, &sb) < 0) {
+                HDperror("fstat");
+                HDexit(EXIT_FAILURE);
+            }
+            src_act_size = sb.st_size;
+            if (src_act_size > src_size) {
+                HDfprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long) src_size);
+            }
+            src_offset = 0;
+            if (verbose)
+                HDfprintf(stderr, "< %s\n", src_name);
+        }
+
+    /*
+    * Update the destination offset, opening a new member if one will be
+    * needed. The first member is extended to the logical member size
+    * but other members might be smaller if they end with a hole.
+    */
+        dst_offset = dst_offset + (off_t) n;
+        if (dst_is_family && dst_offset == dst_size) {
+            if (0 == dst_membno) {
+                if (HDlseek (dst, dst_size-1, SEEK_SET) < 0) {
+                    HDperror("HDHDlseek");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDread (dst, buf, 1) < 0) {
+                    HDperror("read");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDlseek (dst, dst_size-1, SEEK_SET) < 0) {
+                    HDperror("HDlseek");
+                    HDexit(EXIT_FAILURE);
+                }
+                if (HDwrite (dst, buf, 1) < 0) {
+                    HDperror("write");
+                    HDexit(EXIT_FAILURE);
+                }
+            }
+            HDclose(dst);
+            HDsprintf(dst_name, dst_gen_name, ++dst_membno);
+            if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
+                HDperror(dst_name);
+                HDexit(EXIT_FAILURE);
+            }
+            dst_offset = 0;
+            need_seek = FALSE;
+            if (verbose)
+                HDfprintf(stderr, "> %s\n", dst_name);
+        }
     }
 
     /*
@@ -401,30 +417,30 @@ main (int argc, char *argv[])
      * family has been truncated.
      */
     if (need_seek) {
-	if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
-	    perror ("HDlseek");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDread (dst, buf, 1)<0) {
-	    perror ("read");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
-	    perror ("HDlseek");
-	    exit (EXIT_FAILURE);
-	}
-	if (HDwrite (dst, buf, 1)<0) {
-	    perror ("write");
-	    exit (EXIT_FAILURE);
-	}
+        if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
+            HDperror ("HDlseek");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDread (dst, buf, 1)<0) {
+            HDperror ("read");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDlseek (dst, dst_offset-1, SEEK_SET)<0) {
+            HDperror ("HDlseek");
+            HDexit (EXIT_FAILURE);
+        }
+        if (HDwrite (dst, buf, 1)<0) {
+            HDperror ("write");
+            HDexit (EXIT_FAILURE);
+        }
     }
     HDclose (dst);
 
     /* Modify family driver information saved in superblock through private property.
      * These private properties are for this tool only. */
-    if ((fapl=H5Pcreate(H5P_FILE_ACCESS))<0) {
-        perror ("H5Pcreate");
-        exit (EXIT_FAILURE);
+    if ((fapl=H5Pcreate(H5P_FILE_ACCESS)) < 0) {
+        HDperror ("H5Pcreate");
+        HDexit (EXIT_FAILURE);
     }
 
     if(family_to_single) {
@@ -433,23 +449,24 @@ main (int argc, char *argv[])
          * the library to ignore the family driver information saved in the superblock.
          */
         if(H5Pset(fapl, H5F_ACS_FAMILY_TO_SINGLE_NAME, &family_to_single) < 0) {
-            perror ("H5Pset");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset");
+            HDexit (EXIT_FAILURE);
         }
-    } else {
+    }
+    else {
         /* Modify family size saved in superblock through private property. It signals
          * library to save the new member size(specified in command line) in superblock.
          * This private property is for this tool only. */
         if(H5Pset_fapl_family(fapl, H5F_FAMILY_DEFAULT, H5P_DEFAULT) < 0) {
-            perror ("H5Pset_fapl_family");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset_fapl_family");
+            HDexit (EXIT_FAILURE);
         }
 
         /* Set the property of the new member size as hsize_t */
         hdsize = (hsize_t)dst_size;
         if(H5Pset(fapl, H5F_ACS_FAMILY_NEWSIZE_NAME, &hdsize) < 0) {
-            perror ("H5Pset");
-            exit (EXIT_FAILURE);
+            HDperror ("H5Pset");
+            HDexit (EXIT_FAILURE);
         }
     }
 
@@ -465,16 +482,16 @@ main (int argc, char *argv[])
         file = H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
     } H5E_END_TRY;
 
-    if(file>=0) {
-        if(H5Fclose(file)<0) {
-            perror ("H5Fclose");
-            exit (EXIT_FAILURE);
+    if(file >= 0) {
+        if(H5Fclose(file) < 0) {
+            HDperror("H5Fclose");
+            HDexit(EXIT_FAILURE);
         } /* end if */
     } /* end if */
 
-    if(H5Pclose(fapl)<0) {
-        perror ("H5Pclose");
-        exit (EXIT_FAILURE);
+    if(H5Pclose(fapl) < 0) {
+        HDperror("H5Pclose");
+        HDexit(EXIT_FAILURE);
     } /* end if */
 
     /* Free resources and return */