merge from develop and apply HDFFV-8611

41 files changed, 1553 insertions, 1077 deletions

diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 5642a9b..b7448db 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -91,7 +91,7 @@ static void table_attrs_free( table_attrs_t *table )
 /*-------------------------------------------------------------------------
  * Function: table_attr_mark_exist
  *
- * Purpose: mark given attribute name to table as sign of exsit
+ * Purpose: mark given attribute name to table as sign of exist
  *
  * Parameter:
  *  - exist [IN]
@@ -322,8 +322,8 @@ hsize_t diff_attr(hid_t loc1_id,
     hid_t      space2_id=-1;    /* space ID */
     hid_t      ftype1_id=-1;    /* file data type ID */
     hid_t      ftype2_id=-1;    /* file data type ID */
-    int	       vstrtype1=0;     /* ftype1 is a variable string */
-    int	       vstrtype2=0;     /* ftype2 is a variable string */
+    int        vstrtype1=0;     /* ftype1 is a variable string */
+    int        vstrtype2=0;     /* ftype2 is a variable string */
     hid_t      mtype1_id=-1;    /* memory data type ID */
     hid_t      mtype2_id=-1;    /* memory data type ID */
     size_t     msize1;          /* memory size of memory type */
@@ -346,7 +346,7 @@ hsize_t diff_attr(hid_t loc1_id,
     hsize_t    nfound_total = 0;
     int       j;
 
-    table_attrs_t * match_list_attrs = NULL;
+    table_attrs_t *match_list_attrs = NULL;
     if(build_match_list_attrs(loc1_id, loc2_id, &match_list_attrs, options) < 0)
         goto error;
 
@@ -395,9 +395,9 @@ hsize_t diff_attr(hid_t loc1_id,
                 continue;
             }
 
-            if((mtype1_id = h5tools_get_native_type(ftype1_id)) < 0)
+            if((mtype1_id = H5Tget_native_type(ftype1_id, H5T_DIR_DEFAULT)) < 0)
                 goto error;
-            if((mtype2_id = h5tools_get_native_type(ftype2_id)) < 0)
+            if((mtype2_id = H5Tget_native_type(ftype2_id, H5T_DIR_DEFAULT)) < 0)
                 goto error;
             if((msize1 = H5Tget_size(mtype1_id)) == 0)
                 goto error;
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index 7d6580c..454f993 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -33,19 +33,14 @@ print_dimensions (int rank, hsize_t *dims)
 {
     int  i;
 
-    if ( rank <= 0 ) 
-    {
+    if( rank <= 0 )
         parallel_print("H5S_SCALAR" );
-    }
-    else 
-    {
+    else {
         if (!dims)
             parallel_print("dimension is NULL");
-        else 
-        {
+        else {
             parallel_print("[");
-            for ( i = 0; i < rank-1; i++)
-            {
+            for ( i = 0; i < rank-1; i++) {
                 parallel_print(HSIZE_T_FORMAT, dims[i]);
                 parallel_print("x");
             }
@@ -74,91 +69,108 @@ print_dimensions (int rank, hsize_t *dims)
  */
 void print_type(hid_t type)
 {
-    switch (H5Tget_class(type))
-    {
+    switch (H5Tget_class(type)) {
     case H5T_INTEGER:
-        if (H5Tequal(type, H5T_STD_I8BE)) {
+        if(H5Tequal(type, H5T_STD_I8BE))
             parallel_print("H5T_STD_I8BE");
-        } else if (H5Tequal(type, H5T_STD_I8LE)) {
+        else if(H5Tequal(type, H5T_STD_I8LE))
             parallel_print("H5T_STD_I8LE");
-        } else if (H5Tequal(type, H5T_STD_I16BE)) {
+        else if(H5Tequal(type, H5T_STD_I16BE))
             parallel_print("H5T_STD_I16BE");
-        } else if (H5Tequal(type, H5T_STD_I16LE)) {
+        else if(H5Tequal(type, H5T_STD_I16LE))
             parallel_print("H5T_STD_I16LE");
-        } else if (H5Tequal(type, H5T_STD_I32BE)) {
+        else if(H5Tequal(type, H5T_STD_I32BE))
             parallel_print("H5T_STD_I32BE");
-        } else if (H5Tequal(type, H5T_STD_I32LE)) {
+        else if(H5Tequal(type, H5T_STD_I32LE))
             parallel_print("H5T_STD_I32LE");
-        } else if (H5Tequal(type, H5T_STD_I64BE)) {
+        else if(H5Tequal(type, H5T_STD_I64BE))
             parallel_print("H5T_STD_I64BE");
-        } else if (H5Tequal(type, H5T_STD_I64LE)) {
+        else if(H5Tequal(type, H5T_STD_I64LE))
             parallel_print("H5T_STD_I64LE");
-        } else if (H5Tequal(type, H5T_STD_U8BE)) {
+        else if(H5Tequal(type, H5T_STD_U8BE))
             parallel_print("H5T_STD_U8BE");
-        } else if (H5Tequal(type, H5T_STD_U8LE)) {
+        else if(H5Tequal(type, H5T_STD_U8LE))
             parallel_print("H5T_STD_U8LE");
-        } else if (H5Tequal(type, H5T_STD_U16BE)) {
+        else if(H5Tequal(type, H5T_STD_U16BE))
             parallel_print("H5T_STD_U16BE");
-        } else if (H5Tequal(type, H5T_STD_U16LE)) {
+        else if(H5Tequal(type, H5T_STD_U16LE))
             parallel_print("H5T_STD_U16LE");
-        } else if (H5Tequal(type, H5T_STD_U32BE)) {
+        else if(H5Tequal(type, H5T_STD_U32BE))
             parallel_print("H5T_STD_U32BE");
-        } else if (H5Tequal(type, H5T_STD_U32LE)) {
+        else if(H5Tequal(type, H5T_STD_U32LE))
             parallel_print("H5T_STD_U32LE");
-        } else if (H5Tequal(type, H5T_STD_U64BE)) {
+        else if(H5Tequal(type, H5T_STD_U64BE))
             parallel_print("H5T_STD_U64BE");
-        } else if (H5Tequal(type, H5T_STD_U64LE)) {
+        else if(H5Tequal(type, H5T_STD_U64LE))
             parallel_print("H5T_STD_U64LE");
-        } else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
+        else if(H5Tequal(type, H5T_NATIVE_SCHAR))
             parallel_print("H5T_NATIVE_SCHAR");
-        } else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
+        else if(H5Tequal(type, H5T_NATIVE_UCHAR))
             parallel_print("H5T_NATIVE_UCHAR");
-        } else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
+        else if(H5Tequal(type, H5T_NATIVE_SHORT))
             parallel_print("H5T_NATIVE_SHORT");
-        } else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
+        else if(H5Tequal(type, H5T_NATIVE_USHORT))
             parallel_print("H5T_NATIVE_USHORT");
-        } else if (H5Tequal(type, H5T_NATIVE_INT)) {
+        else if(H5Tequal(type, H5T_NATIVE_INT))
             parallel_print("H5T_NATIVE_INT");
-        } else if (H5Tequal(type, H5T_NATIVE_UINT)) {
+        else if(H5Tequal(type, H5T_NATIVE_UINT))
             parallel_print("H5T_NATIVE_UINT");
-        } else if (H5Tequal(type, H5T_NATIVE_LONG)) {
+        else if(H5Tequal(type, H5T_NATIVE_LONG))
             parallel_print("H5T_NATIVE_LONG");
-        } else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
+        else if(H5Tequal(type, H5T_NATIVE_ULONG))
             parallel_print("H5T_NATIVE_ULONG");
-        } else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
+        else if(H5Tequal(type, H5T_NATIVE_LLONG))
             parallel_print("H5T_NATIVE_LLONG");
-        } else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
+        else if(H5Tequal(type, H5T_NATIVE_ULLONG))
             parallel_print("H5T_NATIVE_ULLONG");
-        } else {
+        else
             parallel_print("undefined integer");
-        }
         break;
 
     case H5T_FLOAT:
-        if (H5Tequal(type, H5T_IEEE_F32BE)) {
+        if(H5Tequal(type, H5T_IEEE_F32BE))
             parallel_print("H5T_IEEE_F32BE");
-        } else if (H5Tequal(type, H5T_IEEE_F32LE)) {
+        else if(H5Tequal(type, H5T_IEEE_F32LE))
             parallel_print("H5T_IEEE_F32LE");
-        } else if (H5Tequal(type, H5T_IEEE_F64BE)) {
+        else if(H5Tequal(type, H5T_IEEE_F64BE))
             parallel_print("H5T_IEEE_F64BE");
-        } else if (H5Tequal(type, H5T_IEEE_F64LE)) {
+        else if(H5Tequal(type, H5T_IEEE_F64LE))
             parallel_print("H5T_IEEE_F64LE");
-        } else if (H5Tequal(type, H5T_NATIVE_FLOAT)) {
+        else if(H5Tequal(type, H5T_NATIVE_FLOAT))
             parallel_print("H5T_NATIVE_FLOAT");
-        } else if (H5Tequal(type, H5T_NATIVE_DOUBLE)) {
+        else if(H5Tequal(type, H5T_NATIVE_DOUBLE))
             parallel_print("H5T_NATIVE_DOUBLE");
 #if H5_SIZEOF_LONG_DOUBLE !=0
-        } else if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) {
+        else if(H5Tequal(type, H5T_NATIVE_LDOUBLE))
             parallel_print("H5T_NATIVE_LDOUBLE");
 #endif
-        } else {
+        else
             parallel_print("undefined float");
-        }
+        break;
+
+    case H5T_BITFIELD:
+        if(H5Tequal(type, H5T_STD_B8BE))
+            parallel_print("H5T_STD_B8BE");
+        else if(H5Tequal(type, H5T_STD_B8LE))
+            parallel_print("H5T_STD_B8LE");
+        else if(H5Tequal(type, H5T_STD_B16BE))
+            parallel_print("H5T_STD_B16BE");
+        else if(H5Tequal(type, H5T_STD_B16LE))
+            parallel_print("H5T_STD_B16LE");
+        else if(H5Tequal(type, H5T_STD_B32BE))
+            parallel_print("H5T_STD_B32BE");
+        else if(H5Tequal(type, H5T_STD_B32LE))
+            parallel_print("H5T_STD_B32LE");
+        else if(H5Tequal(type, H5T_STD_B64BE))
+            parallel_print("H5T_STD_B64BE");
+        else if(H5Tequal(type, H5T_STD_B64LE))
+            parallel_print("H5T_STD_B64LE");
+        else
+            parallel_print("undefined bitfield");
         break;
 
     case H5T_TIME:
     case H5T_STRING:
-    case H5T_BITFIELD:
     case H5T_OPAQUE:
     case H5T_COMPOUND:
     case H5T_REFERENCE:
@@ -189,16 +201,16 @@ diff_basename(const char *name)
 {
     size_t i;
 
-    if (name == NULL)
+    if(name == NULL)
         return NULL;
 
     /* Find the end of the base name */
     i = HDstrlen(name);
-    while (i > 0 && '/' == name[i - 1])
+    while(i > 0 && '/' == name[i - 1])
         --i;
 
     /* Skip backward over base name */
-    while (i > 0 && '/' != name[i - 1])
+    while(i > 0 && '/' != name[i - 1])
         --i;
 
     return(name+i);
@@ -256,7 +268,7 @@ get_type(h5trav_type_t type)
 H5_ATTR_PURE const char*
 get_sign(H5T_sign_t sign)
 {
-    switch (sign)
+    switch(sign)
     {
         case H5T_SGN_NONE:
             return "H5T_SGN_NONE";
@@ -291,7 +303,7 @@ get_sign(H5T_sign_t sign)
 H5_ATTR_PURE const char*
 get_class(H5T_class_t tclass)
 {
-    switch (tclass) {
+    switch(tclass) {
         case H5T_TIME:
             return("H5T_TIME");
 
@@ -351,24 +363,21 @@ void print_found(hsize_t nfound)
 
 /*-----------------------------------------------------------------
  * Function: match_up_memsize
- *  
+ *
  * Purpose: match smaller memory size up to bigger memory size
  *------------------------------------------------------------------
  */
 herr_t match_up_memsize (hid_t f_tid1_id, hid_t f_tid2_id,
-                         hid_t *m_tid1, hid_t *m_tid2, 
+                         hid_t *m_tid1, hid_t *m_tid2,
                          size_t *m_size1, size_t  *m_size2)
 {
     herr_t ret = SUCCEED;
 
-    if( (*m_size1) != (*m_size2) )
-    {
-        if( (*m_size1) < (*m_size2) )
-        {
+    if((*m_size1) != (*m_size2)) {
+        if((*m_size1) < (*m_size2)) {
             H5Tclose( *m_tid1 );
 
-            if(( (*m_tid1) = h5tools_get_native_type(f_tid2_id)) < 0)
-            {
+            if(((*m_tid1) = H5Tget_native_type(f_tid2_id, H5T_DIR_DEFAULT)) < 0) {
                 ret = FAIL;
                 goto out;
             }
@@ -378,8 +387,7 @@ herr_t match_up_memsize (hid_t f_tid1_id, hid_t f_tid2_id,
         else {
             H5Tclose(*m_tid2);
 
-            if(( (*m_tid2) = h5tools_get_native_type(f_tid1_id)) < 0)
-            {
+            if(((*m_tid2) = H5Tget_native_type(f_tid1_id, H5T_DIR_DEFAULT)) < 0) {
                 ret = FAIL;
                 goto out;
             }
@@ -387,7 +395,7 @@ herr_t match_up_memsize (hid_t f_tid1_id, hid_t f_tid2_id,
             *m_size2 = H5Tget_size(*m_tid2);
         } /* end else */
     } /* end if */
-    HDassert( (*m_size1) == (*m_size2) );
+    HDassert((*m_size1) == (*m_size2));
 
 out:
     return ret;
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 62b05d9..22fd863 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -281,16 +281,16 @@ h5tools_set_attr_output_file(const char *fname, int is_bin)
     if (fname != NULL) {
         /* binary output */
         if (is_bin) {
-			if ((f = HDfopen(fname, "wb")) != NULL) {
-				rawattrstream = f;
-				retvalue = SUCCEED;
-			}
+            if ((f = HDfopen(fname, "wb")) != NULL) {
+                rawattrstream = f;
+                retvalue = SUCCEED;
+            }
         }
         else {
-			if ((f = HDfopen(fname, "w")) != NULL) {
-				rawattrstream = f;
-				retvalue = SUCCEED;
-			}
+            if ((f = HDfopen(fname, "w")) != NULL) {
+                rawattrstream = f;
+                retvalue = SUCCEED;
+            }
         }
     }
     else {
@@ -323,26 +323,26 @@ h5tools_set_input_file(const char *fname, int is_bin)
         if (HDfclose(rawinstream))
             HDperror("closing rawinstream");
         else
-        	rawinstream = NULL;
+            rawinstream = NULL;
     }
     /* First check if filename is string "NULL" */
     if (fname != NULL) {
         /* binary output */
         if (is_bin) {
-			if ((f = HDfopen(fname, "rb")) != NULL) {
-				rawinstream = f;
-				retvalue = SUCCEED;
-			}
+            if ((f = HDfopen(fname, "rb")) != NULL) {
+                rawinstream = f;
+                retvalue = SUCCEED;
+            }
         }
         else {
-			if ((f = HDfopen(fname, "r")) != NULL) {
-				rawinstream = f;
-				retvalue = SUCCEED;
-			}
+            if ((f = HDfopen(fname, "r")) != NULL) {
+                rawinstream = f;
+                retvalue = SUCCEED;
+            }
         }
     }
     else {
-    	rawinstream = NULL;
+        rawinstream = NULL;
         retvalue = SUCCEED;
     }
 
@@ -377,16 +377,16 @@ h5tools_set_output_file(const char *fname, int is_bin)
     if (fname != NULL) {
         /* binary output */
         if (is_bin) {
-			if ((f = HDfopen(fname, "wb")) != NULL) {
-					rawoutstream = f;
-					retvalue = SUCCEED;
-			}
+            if ((f = HDfopen(fname, "wb")) != NULL) {
+                rawoutstream = f;
+                retvalue = SUCCEED;
+            }
         }
         else {
-			if ((f = HDfopen(fname, "w")) != NULL) {
-					rawoutstream = f;
-					retvalue = SUCCEED;
-			}
+            if ((f = HDfopen(fname, "w")) != NULL) {
+                rawoutstream = f;
+                retvalue = SUCCEED;
+            }
         }
     }
     else {
@@ -425,21 +425,21 @@ h5tools_set_error_file(const char *fname, int is_bin)
     /* First check if filename is string "NULL" */
     if (fname != NULL) {
     /* binary output */
-		if (is_bin) {
-			if ((f = HDfopen(fname, "wb")) != NULL) {
-				rawerrorstream = f;
-				retvalue = SUCCEED;
-			}
+        if (is_bin) {
+            if ((f = HDfopen(fname, "wb")) != NULL) {
+                rawerrorstream = f;
+                retvalue = SUCCEED;
+            }
         }
         else {
-			if ((f = HDfopen(fname, "w")) != NULL) {
-				rawerrorstream = f;
-				retvalue = SUCCEED;
-			}
-		}
+            if ((f = HDfopen(fname, "w")) != NULL) {
+                rawerrorstream = f;
+                retvalue = SUCCEED;
+            }
+        }
     }
     else {
-    	rawerrorstream = NULL;
+        rawerrorstream = NULL;
         retvalue = SUCCEED;
     }
 
@@ -1326,6 +1326,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
         case H5T_INTEGER:
         case H5T_FLOAT:
         case H5T_ENUM:
+        case H5T_BITFIELD:
             block_index = block_nelmts * size;
             while(block_index > 0) {
                 size_t bytes_in        = 0;    /* # of bytes to write  */
@@ -1492,7 +1493,6 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,  hsize_t
             break;
 
         case H5T_TIME:
-        case H5T_BITFIELD:
         case H5T_OPAQUE:
             for (block_index = 0; block_index < block_nelmts; block_index++) {
                 mem = ((unsigned char*)_mem) + block_index * size;
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index bf8e673..3d38dd0 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -590,7 +590,6 @@ H5TOOLS_DLL int     h5tools_set_output_file(const char *fname, int is_bin);
 H5TOOLS_DLL int     h5tools_set_error_file(const char *fname, int is_bin);
 H5TOOLS_DLL hid_t   h5tools_fopen(const char *fname, unsigned flags, hid_t fapl,
                             const char *driver, char *drivername, size_t drivername_len);
-H5TOOLS_DLL hid_t   h5tools_get_native_type(hid_t type);
 H5TOOLS_DLL hid_t   h5tools_get_little_endian_type(hid_t type);
 H5TOOLS_DLL hid_t   h5tools_get_big_endian_type(hid_t type);
 H5TOOLS_DLL htri_t  h5tools_detect_vlen(hid_t tid);
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 381a253..1a57512 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -1795,7 +1795,7 @@ h5tools_dump_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
     else if (bin_form == 3)
         p_type = h5tools_get_big_endian_type(f_type);
     else
-        p_type = h5tools_get_native_type(f_type);
+        p_type = H5Tget_native_type(f_type, H5T_DIR_DEFAULT);
 
     if (p_type < 0)
         goto done;
@@ -2957,7 +2957,7 @@ h5tools_print_fill_value(h5tools_str_t *buffer/*in,out*/, const h5tool_format_t
     hid_t             n_type;
     void             *buf = NULL;
 
-    n_type = h5tools_get_native_type(type_id);
+    n_type = H5Tget_native_type(type_id, H5T_DIR_DEFAULT);
 
     size = H5Tget_size(n_type);
     buf = HDmalloc(size);
@@ -3785,7 +3785,7 @@ void
 h5tools_print_packed_bits(h5tools_str_t *buffer, hid_t type)
 {
     unsigned packed_bits_size = 0;
-    hid_t n_type = h5tools_get_native_type(type);
+    hid_t n_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
     if(H5Tget_class(n_type) == H5T_INTEGER) {
         if(H5Tequal(n_type, H5T_NATIVE_SCHAR) == TRUE)
@@ -4043,7 +4043,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info,
             unsigned int        vl_data = 0; /* contains VL datatypes */
 
             type = H5Aget_type(obj_id);
-            p_type = h5tools_get_native_type(type);
+            p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
             ndims = H5Sget_simple_extent_dims(space, size, NULL);
 
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 88f6cc5..b7a2c1e 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -23,24 +23,24 @@
 #include <string.h>
 
 #include "H5private.h"
-#include "h5tools.h"            /*for h5tool_format_t structure    */
+#include "h5tools.h"            /* for h5tool_format_t structure */
 #include "h5tools_ref.h"
-#include "h5tools_str.h"        /*function prototypes       */
+#include "h5tools_str.h"        /* function prototypes */
 
 /* Copied from hl/src/H5LDprivate.h */
 /* Info about the list of comma-separated compound fields */
 typedef struct H5LD_memb_t {
-   size_t tot_offset;
-   size_t last_tsize;
-   hid_t last_tid;
-   char **names;
+    size_t    tot_offset;
+    size_t    last_tsize;
+    hid_t     last_tid;
+    char    **names;
 } H5LD_memb_t;
 
 /*
  * If REPEAT_VERBOSE is defined then character strings will be printed so
  * that repeated character sequences like "AAAAAAAAAA" are displayed as
  *
- *  'A' repeates 9 times
+ *  'A' repeats 9 times
  *
  * Otherwise the format is more Perl-like
  *
@@ -61,15 +61,12 @@ void            h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *in
  * Function:    h5tools_str_close
  *
  * Purpose: Closes a string by releasing it's memory and setting the size
- *      information to zero.
+ *          information to zero.
  *
  * Return:  void
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -85,17 +82,14 @@ h5tools_str_close(h5tools_str_t *str)
  * Function:    h5tools_str_len
  *
  * Purpose: Returns the length of the string, not counting the null
- *      terminator.
+ *          terminator.
  *
  * Return:  Success:    Length of string
  *
- *      Failure:    0
+ *          Failure:    0
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 H5_ATTR_PURE size_t
@@ -108,43 +102,34 @@ h5tools_str_len(h5tools_str_t *str)
  * Function:    h5tools_str_append
  *
  * Purpose: Formats variable arguments according to printf() format
- *      string and appends the result to variable length string STR.
+ *          string and appends the result to variable length string STR.
  *
  * Return:  Success:    Pointer to buffer containing result.
  *
- *      Failure:    NULL
+ *          Failure:    NULL
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
- *              Major change:  need to check results of vsnprintf to
- *              handle errors, empty format, and overflows.
- *
- * Programmer:  REMcG Matzke
- *              June 16, 2004
- *
  *-------------------------------------------------------------------------
  */
 char *
 h5tools_str_append(h5tools_str_t *str/*in,out*/, const char *fmt, ...)
 {
-    va_list ap;
+    va_list    ap;
 
     /* Make sure we have some memory into which to print */
-    if (!str->s || str->nalloc <= 0)
+    if(!str->s || str->nalloc <= 0)
         h5tools_str_reset(str);
 
-    if (HDstrlen(fmt) == 0)
+    if(HDstrlen(fmt) == 0)
         /* nothing to print */
         return str->s;
 
     /* Format the arguments and append to the value already in `str' */
-    while (1) {
+    while(1) {
         /* How many bytes available for new value, counting the new NUL */
+        int    nchars = -1;
         size_t avail = str->nalloc - str->len;
-        int nchars = -1;
 
         HDva_start(ap, fmt);
         nchars = HDvsnprintf(str->s + str->len, avail, fmt, ap);
@@ -161,11 +146,11 @@ h5tools_str_append(h5tools_str_t *str/*in,out*/, const char *fmt, ...)
          * to lack of buffer size, so try one more time after realloc more
          * buffer size before return NULL.
          */
-        if (nchars < 0)
+        if(nchars < 0)
             /* failure, such as bad format */
             return NULL;
 
-        if ((size_t) nchars >= avail || (0 == nchars && (HDstrcmp(fmt, "%s")))) {
+        if((size_t) nchars >= avail || (0 == nchars && (HDstrcmp(fmt, "%s")))) {
             /* Truncation return value as documented by C99, or zero return value with either of the
              * following conditions, each of which indicates that the proper C99 return value probably
              *  should have been positive when the format string is
@@ -191,24 +176,21 @@ h5tools_str_append(h5tools_str_t *str/*in,out*/, const char *fmt, ...)
  * Function:    h5tools_str_reset
  *
  * Purpose: Reset the string to the empty value. If no memory is
- *      allocated yet then initialize the h5tools_str_t struct.
+ *          allocated yet then initialize the h5tools_str_t struct.
  *
  * Return:  Success:    Ptr to the buffer which contains a null
- *              character as the first element.
+ *                      character as the first element.
  *
- *      Failure:    NULL
+ *          Failure:    NULL
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 char *
 h5tools_str_reset(h5tools_str_t *str/*in,out*/)
 {
-    if (!str->s || str->nalloc <= 0) {
+    if(!str->s || str->nalloc <= 0) {
         str->nalloc = STR_INIT_LEN;
         str->s = (char*)HDmalloc(str->nalloc);
         HDassert(str->s);
@@ -226,19 +208,16 @@ h5tools_str_reset(h5tools_str_t *str/*in,out*/)
  *
  * Return:  Success:    Pointer to the string
  *
- *      Failure:    NULL
+ *          Failure:    NULL
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 char *
 h5tools_str_trunc(h5tools_str_t *str/*in,out*/, size_t size)
 {
-    if (size < str->len) {
+    if(size < str->len) {
         str->len = size;
         str->s[size] = '\0';
     }
@@ -250,41 +229,38 @@ h5tools_str_trunc(h5tools_str_t *str/*in,out*/, size_t size)
  * Function:    h5tools_str_fmt
  *
  * Purpose: Reformat a string contents beginning at character START
- *      according to printf format FMT. FMT should contain no format
- *      specifiers except possibly the `%s' variety. For example, if
- *      the input string is `hello' and the format is "<<%s>>" then
- *      the output value will be "<<hello>>".
+ *          according to printf format FMT. FMT should contain no format
+ *          specifiers except possibly the `%s' variety. For example, if
+ *          the input string is `hello' and the format is "<<%s>>" then
+ *          the output value will be "<<hello>>".
  *
  * Return:  Success:    A pointer to the resulting string.
  *
- *      Failure:    NULL
+ *          Failure:    NULL
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 char *
 h5tools_str_fmt(h5tools_str_t *str/*in,out*/, size_t start, const char *fmt)
 {
-    char _temp[1024], *temp = _temp;
+    char    _temp[1024], *temp = _temp;
 
     HDassert(str);
     HDassert(fmt);
 
     /* If the format string is simply "%s" then don't bother doing anything */
-    if (!HDstrcmp(fmt, "%s"))
+    if(!HDstrcmp(fmt, "%s"))
         return str->s;
 
     /*
      * Save the input value if there is a `%' anywhere in FMT.  Otherwise
      * don't bother because we don't need a temporary copy.
      */
-    if (HDstrchr(fmt, '%')) {
+    if(HDstrchr(fmt, '%')) {
         size_t n = sizeof(_temp);
-        if (str->len - start + 1 > n) {
+        if(str->len - start + 1 > n) {
             n = str->len - start + 1;
             temp = (char*)HDmalloc(n);
             HDassert(temp);
@@ -298,7 +274,7 @@ h5tools_str_fmt(h5tools_str_t *str/*in,out*/, size_t start, const char *fmt)
     h5tools_str_append(str, fmt, temp);
 
     /* Free the temp buffer if we allocated one */
-    if (temp != _temp)
+    if(temp != _temp)
         HDfree(temp);
 
     return str->s;
@@ -311,37 +287,34 @@ h5tools_str_fmt(h5tools_str_t *str/*in,out*/, size_t start, const char *fmt)
  *
  * Return:  Success:    Pointer to the prefix.
  *
- *      Failure:    NULL
+ *          Failure:    NULL
  *
  * Programmer:  Robb Matzke
  *              Thursday, July 23, 1998
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 char *
 h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info,
     hsize_t elmtno, unsigned ndims, h5tools_context_t *ctx)
 {
-    size_t i = 0;
-    hsize_t curr_pos = elmtno;
+    size_t    i = 0;
+    hsize_t   curr_pos = elmtno;
 
     h5tools_str_reset(str);
 
-    if (ndims > 0) {
+    if(ndims > 0) {
         /*
          * Calculate the number of elements represented by a unit change in a
          * certain index position.
          */
-        for (i = 0; i < (size_t) ndims; i++) {
+        for(i = 0; i < (size_t) ndims; i++) {
             ctx->pos[i] = curr_pos / ctx->acc[i];
             curr_pos -= ctx->acc[i] * ctx->pos[i];
         }
         HDassert(curr_pos == 0);
 
         /* Print the index values */
-        for (i = 0; i < (size_t) ndims; i++) {
+        for(i = 0; i < (size_t) ndims; i++) {
             if (i)
                 h5tools_str_append(str, "%s", OPT(info->idx_sep, ","));
 
@@ -350,10 +323,8 @@ h5tools_str_prefix(h5tools_str_t *str/*in,out*/, const h5tool_format_t *info,
 
         }
     }
-    else {
-        /* Scalar */
+    else        /* Scalar */
         h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t) 0);
-    }
 
     /* Add prefix and suffix to the index */
     return h5tools_str_fmt(str, (size_t)0, OPT(info->idx_fmt, "%s: "));
@@ -377,21 +348,21 @@ h5tools_str_region_prefix(h5tools_str_t *str, const h5tool_format_t *info,
         hsize_t elmtno, hsize_t *ptdata, unsigned ndims, hsize_t max_idx[],
         h5tools_context_t *ctx)
 {
-    hsize_t p_prod[H5S_MAX_RANK];
-    size_t i = 0;
-    hsize_t curr_pos = elmtno;
+    size_t    i = 0;
+    hsize_t   curr_pos = elmtno;
+    hsize_t   p_prod[H5S_MAX_RANK];
 
     h5tools_str_reset(str);
 
-    if (ndims > 0) {
+    if(ndims > 0) {
         /*
          * Calculate the number of elements represented by a unit change in a
          * certain index position.
          */
-        for (i = ndims - 1, p_prod[ndims - 1] = 1; i > 0; --i)
+        for(i = ndims - 1, p_prod[ndims - 1] = 1; i > 0; --i)
             p_prod[i - 1] = (max_idx[i]) * p_prod[i];
 
-        for (i = 0; i < (size_t) ndims; i++) {
+        for(i = 0; i < (size_t) ndims; i++) {
             if(curr_pos > 0) {
                 ctx->pos[i] = curr_pos / p_prod[i];
                 curr_pos -= p_prod[i] * ctx->pos[i];
@@ -402,18 +373,16 @@ h5tools_str_region_prefix(h5tools_str_t *str, const h5tool_format_t *info,
         }
 
         /* Print the index values */
-        for (i = 0; i < (size_t) ndims; i++) {
-            if (i)
+        for(i = 0; i < (size_t) ndims; i++) {
+            if(i)
                 h5tools_str_append(str, "%s", OPT(info->idx_sep, ","));
 
             h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t) ctx->pos[i]);
 
         }
     } /* if (ndims > 0) */
-    else {
-        /* Scalar */
+    else        /* Scalar */
         h5tools_str_append(str, OPT(info->idx_n_fmt, HSIZE_T_FORMAT), (hsize_t) 0);
-    }
 
     /* Add prefix and suffix to the index */
     return h5tools_str_fmt(str, (size_t)0, OPT(info->idx_fmt, "%s: "));
@@ -449,7 +418,7 @@ h5tools_str_dump_space_slabs(h5tools_str_t *str, hid_t rspace,
 
     /* Start coordinates */
     h5tools_str_append(str, "%s%s ", info->line_indent, START);
-    for (j = 0; j < ndims; j++)
+    for(j = 0; j < ndims; j++)
         h5tools_str_append(str, "%s" HSIZE_T_FORMAT, j ? "," : "(", start[j]);
     h5tools_str_append(str, ")");
     h5tools_str_append(str, "%s", "\n");
@@ -457,7 +426,7 @@ h5tools_str_dump_space_slabs(h5tools_str_t *str, hid_t rspace,
 
     /* Stride coordinates */
     h5tools_str_append(str, "%s ", STRIDE);
-    for (j = 0; j < ndims; j++)
+    for(j = 0; j < ndims; j++)
         h5tools_str_append(str, "%s" HSIZE_T_FORMAT, j ? "," : "(", stride[j]);
     h5tools_str_append(str, ")");
     h5tools_str_append(str, "%s", "\n");
@@ -465,7 +434,7 @@ h5tools_str_dump_space_slabs(h5tools_str_t *str, hid_t rspace,
 
     /* Count coordinates */
     h5tools_str_append(str, "%s ", COUNT);
-    for (j = 0; j < ndims; j++) {
+    for(j = 0; j < ndims; j++) {
         if(count[j] == H5S_UNLIMITED)
             h5tools_str_append(str, "%s%s", j ? "," : "(","H5S_UNLIMITED");
         else
@@ -477,7 +446,7 @@ h5tools_str_dump_space_slabs(h5tools_str_t *str, hid_t rspace,
 
     /* Block coordinates */
     h5tools_str_append(str, "%s ", BLOCK);
-    for (j = 0; j < ndims; j++) {
+    for(j = 0; j < ndims; j++) {
         if(block[j] == H5S_UNLIMITED)
             h5tools_str_append(str, "%s%s", j ? "," : "(","H5S_UNLIMITED");
         else
@@ -494,8 +463,7 @@ h5tools_str_dump_space_slabs(h5tools_str_t *str, hid_t rspace,
  *
  * Return:  none
  *
- * In/Out:
- *      h5tools_str_t     *str
+ * In/Out:  h5tools_str_t     *str
  *-------------------------------------------------------------------------
  */
 void
@@ -512,12 +480,12 @@ h5tools_str_dump_space_blocks(h5tools_str_t *str, hid_t rspace,
     } H5E_END_TRY;
 
     /* Print block information */
-    if (snblocks > 0) {
+    if(snblocks > 0) {
+        hsize_t    alloc_size;
         hsize_t    nblocks;
         hsize_t   *ptdata;
-        hsize_t    alloc_size;
+        hsize_t    u;
         unsigned   ndims = (unsigned)H5Sget_simple_extent_ndims(rspace);
-        hsize_t u;
 
         nblocks = (hsize_t)snblocks;
         alloc_size = nblocks * ndims * 2 * sizeof(ptdata[0]);
@@ -525,17 +493,17 @@ h5tools_str_dump_space_blocks(h5tools_str_t *str, hid_t rspace,
         ptdata = (hsize_t *)HDmalloc((size_t) alloc_size);
         H5Sget_select_hyper_blocklist(rspace, (hsize_t)0, nblocks, ptdata);
 
-        for (u = 0; u < nblocks; u++) {
+        for(u = 0; u < nblocks; u++) {
             unsigned v;
 
             h5tools_str_append(str, info->dset_blockformat_pre, u ? "," OPTIONAL_LINE_BREAK " " : "", (unsigned long)u);
 
             /* Start coordinates and opposite corner */
-            for (v = 0; v < ndims; v++)
+            for(v = 0; v < ndims; v++)
                 h5tools_str_append(str, "%s" HSIZE_T_FORMAT, v ? "," : "(",
                                     ptdata[u * 2 * ndims + v]);
 
-            for (v = 0; v < ndims; v++)
+            for(v = 0; v < ndims; v++)
                 h5tools_str_append(str, "%s" HSIZE_T_FORMAT, v ? "," : ")-(",
                                     ptdata[u * 2 * ndims + v + ndims]);
 
@@ -554,8 +522,7 @@ h5tools_str_dump_space_blocks(h5tools_str_t *str, hid_t rspace,
  *
  * Return:  none
  *
- * In/Out:
- *      h5tools_str_t     *str
+ * In/Out:  h5tools_str_t     *str
  *-------------------------------------------------------------------------
  */
 void
@@ -573,11 +540,11 @@ h5tools_str_dump_space_points(h5tools_str_t *str, hid_t rspace,
 
     /* Print point information */
     if (snpoints > 0) {
-        hsize_t   npoints;
         hsize_t    alloc_size;
+        hsize_t    npoints;
         hsize_t   *ptdata;
-        unsigned ndims = (unsigned)H5Sget_simple_extent_ndims(rspace);
-        hsize_t u;
+        hsize_t    u;
+        unsigned   ndims = (unsigned)H5Sget_simple_extent_ndims(rspace);
 
         npoints = (hsize_t)snpoints;
         alloc_size = npoints * ndims * sizeof(ptdata[0]);
@@ -585,13 +552,13 @@ h5tools_str_dump_space_points(h5tools_str_t *str, hid_t rspace,
         ptdata = (hsize_t *)HDmalloc((size_t) alloc_size);
         H5Sget_select_elem_pointlist(rspace, (hsize_t)0, npoints, ptdata);
 
-        for (u = 0; u < npoints; u++) {
+        for(u = 0; u < npoints; u++) {
             unsigned v;
 
             h5tools_str_append(str, info->dset_ptformat_pre, u ? "," OPTIONAL_LINE_BREAK " " : "",
                                (unsigned long)u);
 
-            for (v = 0; v < ndims; v++)
+            for(v = 0; v < ndims; v++)
                 h5tools_str_append(str, "%s" HSIZE_T_FORMAT, v ? "," : "(",
                                   (ptdata[u * ndims + v]));
 
@@ -614,16 +581,16 @@ h5tools_str_dump_space_points(h5tools_str_t *str, hid_t rspace,
 static void
 h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch)
 {
-    if (info->str_locale == ESCAPE_HTML) {
-        if (ch <= ' ' || ch > '~')
+    if(info->str_locale == ESCAPE_HTML) {
+        if(ch <= ' ' || ch > '~')
             h5tools_str_append(str, "%%%02x", ch);
         else
             h5tools_str_append(str, "%c", ch);
     }
     else {
-        switch (ch) {
+        switch(ch) {
         case '"':
-            if (!info->do_escape)
+            if(!info->do_escape)
                 h5tools_str_append(str, "\"");
             else
                 h5tools_str_append(str, "\\\"");
@@ -635,19 +602,19 @@ h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch)
                 h5tools_str_append(str, "\\\\");
             break;
         case '\b':
-            if (!info->do_escape)
+            if(!info->do_escape)
                 h5tools_str_append(str, "\b");
             else
                 h5tools_str_append(str, "\\b");
             break;
         case '\f':
-            if (!info->do_escape)
+            if(!info->do_escape)
                 h5tools_str_append(str, "\f");
             else
                 h5tools_str_append(str, "\\f");
             break;
         case '\n':
-            if (!info->do_escape) {
+            if(!info->do_escape) {
                 h5tools_str_append(str, "\n");
                 h5tools_str_append(str, "           ");
             }
@@ -655,7 +622,7 @@ h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch)
                 h5tools_str_append(str, "\\n");
             break;
         case '\r':
-            if (!info->do_escape) {
+            if(!info->do_escape) {
                 h5tools_str_append(str, "\r");
                 h5tools_str_append(str, "           ");
             }
@@ -663,13 +630,13 @@ h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch)
                 h5tools_str_append(str, "\\r");
             break;
         case '\t':
-            if (!info->do_escape)
+            if(!info->do_escape)
                 h5tools_str_append(str, "\t");
             else
                 h5tools_str_append(str, "\\t");
             break;
         default:
-            if (isprint(ch))
+            if(isprint(ch))
                 h5tools_str_append(str, "%c", ch);
             else
                 h5tools_str_append(str, "\\%03o", ch);
@@ -685,7 +652,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info,
     unsigned u, indentlevel = 0;
 
     /* Write new prefix */
-    if (ctx->indent_level > 0)
+    if(ctx->indent_level > 0)
         indentlevel = ctx->indent_level;
     else
         /*
@@ -696,7 +663,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info,
          */
         indentlevel = ctx->default_indent_level;
 
-    for (u = 0; u < indentlevel; u++)
+    for(u = 0; u < indentlevel; u++)
         h5tools_str_append(str, "%s", OPT(info->line_indent, ""));
 }
 
@@ -738,7 +705,7 @@ h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info,
  *  added H5T_NATIVE_LDOUBLE case
  *
  *  Vailin Choi; August 2010
- *	Modified to handle printing of selected compound fields for h5watch.
+ *    Modified to handle printing of selected compound fields for h5watch.
  *
  *  Raymond Lu, 2011-09-01
  *  CLANG compiler complained about the line (about 800):
@@ -765,7 +732,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
     H5T_class_t    type_class;
 
     /* Build default formats for long long types */
-    if (!fmt_llong[0]) {
+    if(!fmt_llong[0]) {
         HDsnprintf(fmt_llong, sizeof(fmt_llong), "%%%sd", H5_PRINTF_LL_WIDTH);
         HDsnprintf(fmt_ullong, sizeof(fmt_ullong), "%%%su", H5_PRINTF_LL_WIDTH);
     }
@@ -775,33 +742,31 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
     nsize = H5Tget_size(type);
     nsign = H5Tget_sign(type);
-    if (info->raw) {
+    if(info->raw) {
         size_t i;
 
-        if (1 == nsize) {
+        if(1 == nsize)
             h5tools_str_append(str, OPT(info->fmt_raw, "0x%02x"), ucp_vp[0]);
-        }
-        else {
-            for (i = 0; i < nsize; i++) {
-                if (i)
+        else
+            for(i = 0; i < nsize; i++) {
+                if(i)
                     h5tools_str_append(str, ":");
                 h5tools_str_append(str, OPT(info->fmt_raw, "%02x"), ucp_vp[i]);
             }
-        }
     }
     else {
         if((type_class = H5Tget_class(type)) < 0)
             return NULL;
         switch (type_class) {
             case H5T_FLOAT:
-                if (sizeof(float) == nsize) {
+                if(sizeof(float) == nsize) {
                     /* if (H5Tequal(type, H5T_NATIVE_FLOAT)) */
                     float tempfloat;
 
                     HDmemcpy(&tempfloat, vp, sizeof(float));
                     h5tools_str_append(str, OPT(info->fmt_float, "%g"), (double)tempfloat);
                 }
-                else if (sizeof(double) == nsize) {
+                else if(sizeof(double) == nsize) {
                     /* if (H5Tequal(type, H5T_NATIVE_DOUBLE)) */
                     double tempdouble;
 
@@ -809,7 +774,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     h5tools_str_append(str, OPT(info->fmt_double, "%g"), tempdouble);
 #if H5_SIZEOF_LONG_DOUBLE !=0
                 }
-                else if (sizeof(long double) == nsize) {
+                else if(sizeof(long double) == nsize) {
                     /* if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) */
                     long double templdouble;
 
@@ -822,15 +787,15 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
             case H5T_STRING:
                 {
                     unsigned int i;
-                    char quote = '\0';
-                    char *s;
+                    char         quote = '\0';
+                    char        *s;
 
                     quote = '\0';
-                    if (H5Tis_variable_str(type)) {
+                    if(H5Tis_variable_str(type)) {
                         /* cp_vp is the pointer into the struct where a `char*' is stored. So we have
                          * to dereference the pointer to get the `char*' to pass to HDstrlen(). */
                         s = *(char**) cp_vp;
-                        if (s != NULL) size = HDstrlen(s);
+                        if(s != NULL) size = HDstrlen(s);
                     }
                     else {
                         s = cp_vp;
@@ -839,10 +804,10 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     pad = H5Tget_strpad(type);
 
                     /* Check for NULL pointer for string */
-                    if (s == NULL)
+                    if(s == NULL)
                         h5tools_str_append(str, "NULL");
                     else {
-                        for (i = 0; i < size && (s[i] || pad != H5T_STR_NULLTERM); i++) {
+                        for(i = 0; i < size && (s[i] || pad != H5T_STR_NULLTERM); i++) {
                             unsigned j = 1;
 
                             /*
@@ -850,7 +815,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                              * threshold is zero then that means it can repeat any number
                              * of times.
                              */
-                            if (info->str_repeat > 0) while (i + j < size && s[i] == s[i + j])
+                            if(info->str_repeat > 0) while (i + j < size && s[i] == s[i + j])
                                 j++;
 
                             /*
@@ -859,14 +824,14 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                              * the characters, then make sure the character to be repeated is
                              * in it's own quote.
                              */
-                            if (info->str_repeat > 0 && j > info->str_repeat) {
-                                if (quote)
+                            if(info->str_repeat > 0 && j > info->str_repeat) {
+                                if(quote)
                                     h5tools_str_append(str, "%c", quote);
 
                                 quote = '\'';
                                 h5tools_str_append(str, "%s%c", i ? " " : "", quote);
                             }
-                            else if (!quote) {
+                            else if(!quote) {
                                 quote = '"';
                                 h5tools_str_append(str, "%s%c", i ? " " : "", quote);
                             }
@@ -875,7 +840,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                             h5tools_print_char(str, info, s[i]);
 
                             /* Print the repeat count */
-                            if (info->str_repeat && j > info->str_repeat) {
+                            if(info->str_repeat && j > info->str_repeat) {
 #ifdef REPEAT_VERBOSE
                                 h5tools_str_append(str, "%c repeats %d times", quote, j - 1);
 #else
@@ -886,10 +851,10 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                             }
                         }
 
-                        if (quote)
+                        if(quote)
                             h5tools_str_append(str, "%c", quote);
 
-                        if (i == 0)
+                        if(i == 0)
                             /*empty string*/
                             h5tools_str_append(str, "\"\"");
                     } /* end else */
@@ -897,15 +862,15 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                 break;
 
             case H5T_INTEGER:
-                if (sizeof(char) == nsize) {
-                    if (info->ascii)
+                if(sizeof(char) == nsize) {
+                    if(info->ascii)
                         h5tools_print_char(str, info, (char) (*ucp_vp));
                     else if(H5T_SGN_NONE == nsign) {
                         unsigned char tempuchar;
 
                         HDmemcpy(&tempuchar, ucp_vp, sizeof(unsigned char));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(unsigned char))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(unsigned char))
                                 tempuchar = 0;
                             else
                                 tempuchar = (unsigned char)((unsigned long long)(tempuchar >> packed_data_offset) & packed_data_mask);
@@ -916,8 +881,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         signed char tempchar;
 
                         HDmemcpy(&tempchar, cp_vp, sizeof(char));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(char))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(char))
                                 tempchar = 0;
                             else
                                 tempchar = (signed char)((unsigned long long)(tempchar >> packed_data_offset) & packed_data_mask);
@@ -925,13 +890,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_schar, "%hhd"), tempchar);
                     }
                 } /* end if (sizeof(char) == nsize) */
-                else if (sizeof(int) == nsize) {
+                else if(sizeof(int) == nsize) {
                     if(H5T_SGN_NONE == nsign) {
-                        unsigned int       tempuint;
+                        unsigned int tempuint;
 
                         HDmemcpy(&tempuint, vp, sizeof(unsigned int));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(unsigned int))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(unsigned int))
                                 tempuint = 0;
                             else
                                 tempuint = (unsigned)((tempuint >> packed_data_offset) & packed_data_mask);
@@ -939,11 +904,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_uint, "%u"), tempuint);
                     }
                     else {
-                        int                tempint;
+                        int tempint;
 
                         HDmemcpy(&tempint, vp, sizeof(int));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(int))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(int))
                                 tempint = 0;
                             else
                                 tempint = (int)((unsigned long long)(tempint >> packed_data_offset) & packed_data_mask);
@@ -951,13 +916,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_int, "%d"), tempint);
                     }
                 } /* end if (sizeof(int) == nsize) */
-                else if (sizeof(short) == nsize) {
+                else if(sizeof(short) == nsize) {
                     if(H5T_SGN_NONE == nsign) {
                         unsigned short tempushort;
 
                         HDmemcpy(&tempushort, vp, sizeof(unsigned short));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(unsigned short))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(unsigned short))
                                 tempushort = 0;
                             else
                                 tempushort = (unsigned short)((unsigned long long)(tempushort >> packed_data_offset) & packed_data_mask);
@@ -968,8 +933,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         short tempshort;
 
                         HDmemcpy(&tempshort, vp, sizeof(short));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(short))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(short))
                                 tempshort = 0;
                             else
                                 tempshort = (short)((unsigned long long)(tempshort >> packed_data_offset) & packed_data_mask);
@@ -977,13 +942,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_short, "%hd"), tempshort);
                     }
                 } /* end if (sizeof(short) == nsize) */
-                else if (sizeof(long) == nsize) {
+                else if(sizeof(long) == nsize) {
                     if(H5T_SGN_NONE == nsign) {
-                        unsigned long      tempulong;
+                        unsigned long tempulong;
 
                         HDmemcpy(&tempulong, vp, sizeof(unsigned long));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(unsigned long))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(unsigned long))
                                 tempulong = 0;
                             else
                                 tempulong = (tempulong >> packed_data_offset) & packed_data_mask;
@@ -991,11 +956,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);
                     }
                     else {
-                        long               templong;
+                        long templong;
 
                         HDmemcpy(&templong, vp, sizeof(long));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(long))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(long))
                                 templong = 0;
                             else
                                 templong = (long)((unsigned long long)(templong >> packed_data_offset) & packed_data_mask);
@@ -1004,13 +969,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     }
                 } /* end if (sizeof(long) == nsize) */
 #if H5_SIZEOF_LONG != H5_SIZEOF_LONG_LONG
-                else if (sizeof(long long) == nsize) {
+                else if(sizeof(long long) == nsize) {
                     if(H5T_SGN_NONE == nsign) {
                         unsigned long long tempullong;
 
                         HDmemcpy(&tempullong, vp, sizeof(unsigned long long));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(unsigned long long))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(unsigned long long))
                                 tempullong = 0;
                             else
                                 tempullong = (tempullong >> packed_data_offset) & packed_data_mask;
@@ -1018,11 +983,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                         h5tools_str_append(str, OPT(info->fmt_ullong, fmt_ullong), tempullong);
                     }
                     else {
-                        long long          templlong;
+                        long long templlong;
 
                         HDmemcpy(&templlong, vp, sizeof(long long));
-                        if (packed_bits_num) {
-                            if (packed_data_offset >= 8 * sizeof(long long))
+                        if(packed_bits_num) {
+                            if(packed_data_offset >= 8 * sizeof(long long))
                                 templlong = 0;
                             else
                                 templlong = (templlong >> packed_data_offset) & packed_data_mask;
@@ -1035,31 +1000,31 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
             case H5T_COMPOUND:
                 if(ctx->cmpd_listv) { /* there is <list_of_fields> */
-                    int save_indent_level;  	/* The indentation level */
-                    size_t curr_field;          /* Current field to display */
-                    int i = 0, x = 0; 		/* Local index variable */
-                    H5LD_memb_t **listv;  	/* Vector of information for <list_of_fields> */
+                    int    save_indent_level;      /* The indentation level */
+                    size_t curr_field;             /* Current field to display */
+                    int    i = 0, x = 0;           /* Local index variable */
+                    H5LD_memb_t **listv;           /* Vector of information for <list_of_fields> */
 
-                    listv = ctx->cmpd_listv;	    
+                    listv = ctx->cmpd_listv;
                     ctx->cmpd_listv = NULL;
 
                     h5tools_str_append(str, "%s", OPT(info->cmpd_pre, "{"));
 
-                    /* 
+                    /*
                      * Go through the vector containing info about the comma-separated list of
-                     * compound fields and then members in each field: 
-                     *	   put in "{", "}", ",", member name and value accordingly.
+                     * compound fields and then members in each field:
+                     *       put in "{", "}", ",", member name and value accordingly.
                      */
                     save_indent_level = ctx->indent_level;
                     for(curr_field = 0; listv[curr_field] != NULL; curr_field++) {
-                        if (curr_field)
+                        if(curr_field)
                             h5tools_str_append(str, "%s", OPT(info->cmpd_sep, ", "OPTIONAL_LINE_BREAK));
-                        else 
+                        else
                             h5tools_str_append(str, "%s", OPT(info->cmpd_end, ""));
 
                         if(info->arr_linebreak)
                             h5tools_str_indent(str, info, ctx);
-                        
+
                         /* Process members of each field */
                         for(i = 0; listv[curr_field]->names[i] != NULL; i++) {
                             h5tools_str_append(str, OPT(info->cmpd_name, ""), listv[curr_field]->names[i]);
@@ -1084,7 +1049,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
                     ctx->cmpd_listv = info->cmpd_listv;
 
-                } else {
+                }
+                else {
                     unsigned nmembs;
                     unsigned j;
 
@@ -1093,13 +1059,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
                     ctx->indent_level++;
 
-                    for (j = 0; j < nmembs; j++) {
-                        if (j)
+                    for(j = 0; j < nmembs; j++) {
+                        if(j)
                             h5tools_str_append(str, "%s", OPT(info->cmpd_sep, ", "OPTIONAL_LINE_BREAK));
                         else
                             h5tools_str_append(str, "%s", OPT(info->cmpd_end, ""));
 
-                        if (info->arr_linebreak)
+                        if(info->arr_linebreak)
                             h5tools_str_indent(str, info, ctx);
 
                         /* The name */
@@ -1117,7 +1083,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     }
                     ctx->indent_level--;
 
-                    if (info->arr_linebreak) {
+                    if(info->arr_linebreak) {
                         h5tools_str_append(str, "%s", OPT(info->cmpd_end, ""));
                         h5tools_str_indent(str, info, ctx);
                     }
@@ -1129,27 +1095,24 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                 {
                     char enum_name[1024];
 
-                    if (H5Tenum_nameof(type, vp, enum_name, sizeof enum_name) >= 0) {
+                    if(H5Tenum_nameof(type, vp, enum_name, sizeof enum_name) >= 0)
                         h5tools_str_append(str, h5tools_escape(enum_name, sizeof(enum_name)));
-                    }
                     else {
                         size_t i;
-                        if (1 == nsize) {
+                        if(1 == nsize)
                             h5tools_str_append(str, "0x%02x", ucp_vp[0]);
-                        }
-                        else {
-                            for (i = 0; i < nsize; i++)
+                        else
+                            for(i = 0; i < nsize; i++)
                                 h5tools_str_append(str, "%s%02x", i ? ":" : "", ucp_vp[i]);
-                        }
                     }
                 }
                 break;
 
             case H5T_REFERENCE:
-                if (h5tools_str_is_zero(vp, nsize))
+                if(h5tools_str_is_zero(vp, nsize))
                     h5tools_str_append(str, "NULL");
                 else {
-                    if (nsize == H5R_DSET_REG_REF_BUF_SIZE) {
+                    if(nsize == H5R_DSET_REG_REF_BUF_SIZE) {
                         /* if (H5Tequal(type, H5T_STD_REF_DSETREG)) */
                         h5tools_str_sprint_region(str, info, container, vp);
                     }
@@ -1159,14 +1122,14 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                              * Object references -- show the type and OID of the referenced
                              * object.
                              */
-                            H5O_info_t oi;
+                            H5O_info_t  oi;
                             const char *path;
 
                             obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, vp);
                             H5Oget_info(obj, &oi);
 
                             /* Print object type and close object */
-                            switch (oi.type) {
+                            switch(oi.type) {
                                 case H5O_TYPE_GROUP:
                                     h5tools_str_append(str, H5_TOOLS_GROUP);
                                     break;
@@ -1188,14 +1151,14 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                             H5Oclose(obj);
 
                             /* Print OID */
-                            if (info->obj_hidefileno)
+                            if(info->obj_hidefileno)
                                 h5tools_str_append(str, info->obj_format, oi.addr);
                             else
                                 h5tools_str_append(str, info->obj_format, oi.fileno, oi.addr);
 
                             /* Print name */
                             path = lookup_ref_path(*(haddr_t *) vp);
-                            if (path) {
+                            if(path) {
                                 h5tools_str_append(str, " ");
                                 h5tools_str_append(str, path);
                                 h5tools_str_append(str, " ");
@@ -1206,8 +1169,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
             case H5T_ARRAY:
                 {
-                    int k, ndims;
-                    hsize_t i, dims[H5S_MAX_RANK], temp_nelmts;
+                    int        k, ndims;
+                    hsize_t    i, dims[H5S_MAX_RANK], temp_nelmts;
                     static int is_next_arry_elmt = 0;
 
                     /* Get the array's base datatype for each element */
@@ -1218,7 +1181,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     HDassert(ndims >= 1 && ndims <= H5S_MAX_RANK);
 
                     /* Calculate the number of array elements */
-                    for (k = 0, nelmts = 1; k < ndims; k++) {
+                    for(k = 0, nelmts = 1; k < ndims; k++) {
                         temp_nelmts = nelmts;
                         temp_nelmts *= dims[k];
                         HDassert(temp_nelmts == (hsize_t) ((size_t) temp_nelmts));
@@ -1229,18 +1192,18 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
                     ctx->indent_level++;
 
-                    for (i = 0; i < nelmts; i++) {
-                        if (i)
+                    for(i = 0; i < nelmts; i++) {
+                        if(i)
                             h5tools_str_append(str, "%s", OPT(info->arr_sep, "," OPTIONAL_LINE_BREAK));
 
-                        if (info->arr_linebreak && i && i % dims[ndims - 1] == 0) {
+                        if(info->arr_linebreak && i && i % dims[ndims - 1] == 0) {
                             h5tools_str_append(str, "%s", "\n");
                             h5tools_str_indent(str, info, ctx);
 
                         } /* end if */
-                        else if (i && info->arr_sep) {
+                        else if(i && info->arr_sep) {
                             /* if next element begin, add next line with indent */
-                            if (is_next_arry_elmt) {
+                            if(is_next_arry_elmt) {
                                 is_next_arry_elmt = 0;
 
                                 h5tools_str_append(str, "%s", "\n ");
@@ -1281,21 +1244,21 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                     /* Get the number of sequence elements */
                     nelmts = ((hvl_t *) cp_vp)->len;
 
-                    for (i = 0; i < nelmts; i++) {
-                        if (i) h5tools_str_append(str, "%s", OPT(info->vlen_sep, "," OPTIONAL_LINE_BREAK));
+                    for(i = 0; i < nelmts; i++) {
+                        if(i) h5tools_str_append(str, "%s", OPT(info->vlen_sep, "," OPTIONAL_LINE_BREAK));
 
 #ifdef LATER
                         /* Need to fix so VL data breaks at correct location on end of line -QAK */
-                        if (info->arr_linebreak && h5tools_str_len(str)>=info->line_ncols) {
+                        if(info->arr_linebreak && h5tools_str_len(str)>=info->line_ncols) {
                             int x;
 
                             h5tools_str_append(str, "%s", "\n");
 
                             /* need to indent some more here */
-                            if (ctx->indent_level >= 0)
+                            if(ctx->indent_level >= 0)
                                 h5tools_str_append(str, "%s", OPT(info->line_pre, ""));
 
-                            for (x = 0; x < ctx->indent_level + 1; x++)
+                            for(x = 0; x < ctx->indent_level + 1; x++)
                                 h5tools_str_append(str,"%s",OPT(info->line_indent,""));
                         } /* end if */
 #endif /* LATER */
@@ -1319,13 +1282,11 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                 {
                     /* All other types get printed as hexadecimal */
                     size_t i;
-                    if (1 == nsize) {
+                    if(1 == nsize)
                         h5tools_str_append(str, "0x%02x", ucp_vp[0]);
-                    }
-                    else {
-                        for (i = 0; i < nsize; i++)
+                    else
+                        for(i = 0; i < nsize; i++)
                             h5tools_str_append(str, "%s%02x", i ? ":" : "", ucp_vp[i]);
-                    }
                 }
                 break;
 
@@ -1352,14 +1313,14 @@ void
 h5tools_str_sprint_region(h5tools_str_t *str, const h5tool_format_t *info,
         hid_t container, void *vp)
 {
-    hid_t   obj, region;
-    char    ref_name[1024];
+    hid_t        obj, region;
+    char         ref_name[1024];
     H5S_sel_type region_type;
 
     obj = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, vp);
-    if (obj >= 0) {
+    if(obj >= 0) {
         region = H5Rget_region(container, H5R_DATASET_REGION, vp);
-        if (region >= 0) {
+        if(region >= 0) {
             H5Rget_name(obj, H5R_DATASET_REGION, vp, (char*) ref_name, 1024);
 
             h5tools_str_append(str, info->dset_format, ref_name);
@@ -1381,33 +1342,30 @@ h5tools_str_sprint_region(h5tools_str_t *str, const h5tool_format_t *info,
 }
 
 /*-------------------------------------------------------------------------
- * Function:    h5tools_escape
+ * Function: h5tools_escape
  *
- * Purpose: Changes all "funny" characters in S into standard C escape
- *      sequences.
+ * Purpose:  Changes all "funny" characters in S into standard C escape
+ *           sequences.
  *
- * Return:  Success:    S
+ * Return:   Success:    S
  *
- *      Failure:    NULL if the buffer would overflow. The
+ *           Failure:    NULL if the buffer would overflow. The
  *              buffer has as many left-to-right escapes as
  *              possible before overflow would have happened.
  *
  * Programmer:  Robb Matzke
  *              Monday, April 26, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static char *
 h5tools_escape(char *s/*in,out*/, size_t size)
 {
-    register size_t i;
-    size_t n = HDstrlen(s);
+    register    size_t i;
     const char *escape;
-    char octal[8];
+    char        octal[8];
+    size_t      n = HDstrlen(s);
 
-    for (i = 0; i < n; i++) {
+    for(i = 0; i < n; i++) {
         switch (s[i]) {
         case '\'':
             escape = "\\\'";
@@ -1443,21 +1401,20 @@ h5tools_escape(char *s/*in,out*/, size_t size)
             escape = "\\v";
             break;
         default:
-            if (!isprint(s[i])) {
+            if(!isprint(s[i])) {
                 HDsnprintf(octal, sizeof(octal), "\\%03o", (unsigned char) s[i]);
                 escape = octal;
             }
-            else {
+            else
                 escape = NULL;
-            }
 
             break;
         }
 
-        if (escape) {
+        if(escape) {
             size_t esc_size = HDstrlen(escape);
 
-            if (n + esc_size + 1 > size)
+            if(n + esc_size + 1 > size)
                 /*would overflow*/
                 return NULL;
 
@@ -1474,15 +1431,12 @@ h5tools_escape(char *s/*in,out*/, size_t size)
 /*-------------------------------------------------------------------------
  * Function:    h5tools_str_is_zero
  *
- * Purpose: Determines if memory is initialized to all zero bytes.
+ * Purpose:     Determines if memory is initialized to all zero bytes.
  *
- * Return:  TRUE if all bytes are zero; FALSE otherwise
+ * Return:      TRUE if all bytes are zero; FALSE otherwise
  *
  * Programmer:  Robb Matzke
  *              Monday, June  7, 1999
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static hbool_t
@@ -1490,8 +1444,8 @@ h5tools_str_is_zero(const void *_mem, size_t size)
 {
     const unsigned char *mem = (const unsigned char *) _mem;
 
-    while (size-- > 0)
-        if (mem[size])
+    while(size-- > 0)
+        if(mem[size])
             return FALSE;
 
     return TRUE;
@@ -1516,11 +1470,11 @@ h5tools_str_is_zero(const void *_mem, size_t size)
 char *
 h5tools_str_replace ( const char *string, const char *substr, const char *replacement )
 {
-    char *tok = NULL;
+    char *tok    = NULL;
     char *newstr = NULL;
-    char *head = NULL;
- 
-    if(substr == NULL || replacement == NULL) 
+    char *head   = NULL;
+
+    if(substr == NULL || replacement == NULL)
         return HDstrdup(string);
     newstr = HDstrdup(string);
     head = newstr;
@@ -1531,8 +1485,8 @@ h5tools_str_replace ( const char *string, const char *substr, const char *replac
         newstr = (char *)HDmalloc(HDstrlen(oldstr) - HDstrlen(substr) + HDstrlen(replacement) + 1);
 
         if(newstr == NULL) {
-	    HDfree(oldstr);
-	    return NULL;
+            HDfree(oldstr);
+            return NULL;
         }
         HDmemcpy(newstr, oldstr, (size_t)(tok - oldstr));
         HDmemcpy(newstr + (tok - oldstr), replacement, HDstrlen(replacement));
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index 49d1ba8..1c3978d 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -108,7 +108,7 @@ static h5tool_format_t         xml_dataformat = {
 
 
 /* internal functions */
-static int      xml_name_to_XID(const char *, char *, int , int );
+static int              xml_name_to_XID(const char *, char *, int , int );
 
 /* internal functions used by XML option */
 static void             xml_print_datatype(hid_t, unsigned);
@@ -122,34 +122,26 @@ static char            *xml_escape_the_name(const char *);
  * Function:    xml_dump_all_cb
  *
  * Purpose:     function callback called by H5Literate,
- *                displays everything in the specified object
+ *              displays everything in the specified object
  *
  * Return:      Success:        SUCCEED
  *
  *              Failure:        FAIL
  *
  * Programmer:  Ruey-Hsia Li
- *
- * Modifications:
- *  RMcG, November 2000
- *   Added XML support. Also, optionally checks the op_data argument
- *
- * PVN, May 2008
- *   Dump external links
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
 xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR_UNUSED *op_data)
 {
-    hid_t       obj;
-    herr_t      ret = SUCCEED;
-    char       *obj_path = NULL;    /* Full path of object */
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    hid_t             obj;
+    herr_t            ret = SUCCEED;
+    char             *obj_path = NULL;    /* Full path of object */
+    h5tools_str_t     buffer;             /* string into which to render */
+    h5tools_context_t ctx;                /* print context */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;       /* total data element position */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -157,7 +149,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -180,7 +172,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
     if(!obj_path) {
         ret = FAIL;
         goto done;
-    } 
+    }
 
     HDstrcpy(obj_path, prefix);
     HDstrcat(obj_path, "/");
@@ -268,7 +260,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         ret = FAIL;
                         H5Dclose(obj);
                         goto done;
-                    } 
+                    }
                     else if(found_obj->displayed) {
                         /* the XML version */
                         char *t_obj_path = xml_escape_the_name(obj_path);
@@ -330,14 +322,14 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
 
                         H5Dclose(obj);
                         goto done;
-                    } 
+                    }
                     else
                         found_obj->displayed = TRUE;
                 } /* end if */
 
                 dump_function_table->dump_dataset_function(obj, name, NULL);
                 H5Dclose(obj);
-            } 
+            }
             else {
                 error_msg("unable to dump dataset \"%s\"\n", name);
                 h5tools_setstatus(EXIT_FAILURE);
@@ -350,7 +342,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                 error_msg("unable to dump datatype \"%s\"\n", name);
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            } 
+            }
             else {
                 dump_function_table->dump_named_datatype_function(obj, name);
                 H5Tclose(obj);
@@ -377,7 +369,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                 error_msg("unable to get link value\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            } 
+            }
             else {
                 /* print the value of a soft link */
                 /* XML */
@@ -426,7 +418,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                             parentxid,      /* Parents */
                             t_prefix);      /* H5ParentPaths */
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-                } 
+                }
                 else {
                     /* dangling link -- omit from xml attributes */
                     ctx.need_prefix = TRUE;
@@ -510,7 +502,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                             parentxid,      /* Parents */
                             t_prefix);      /* H5ParentPaths */
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-                    
+
                     HDfree(t_prefix);
                     HDfree(t_name);
                     HDfree(t_filename);
@@ -556,7 +548,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                         parentxid,          /* Parents */
                         t_prefix);          /* H5ParentPaths */
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-                
+
                 HDfree(t_prefix);
                 HDfree(t_name);
                 HDfree(t_obj_path);
@@ -598,18 +590,18 @@ xml_name_to_XID(const char *str , char *outstr, int outlen, int gen)
                     objno = ref_path_table_gen_fake(str);
                     sprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
                     return 0;
-                } 
+                }
                 else {
                     return 1;
                 }
             }
-        } 
+        }
         else {
             if (gen) {
                 objno = ref_path_table_gen_fake(str);
                 sprintf(outstr, "xid_"H5_PRINTF_HADDR_FMT, objno);
                 return 0;
-            } 
+            }
             else {
                 return 1;
             }
@@ -636,9 +628,6 @@ static const char      *apos = "&apos;";
  * Return:      The revised string.
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static char                   *
@@ -691,23 +680,23 @@ xml_escape_the_name(const char *str)
         if (*cp == '\'') {
             HDstrncpy(ncp, apos, ncp_len);
             esc_len = HDstrlen(apos);
-        } 
+        }
         else if (*cp == '<') {
             HDstrncpy(ncp, lt, ncp_len);
             esc_len = HDstrlen(lt);
-        } 
+        }
         else if (*cp == '>') {
             HDstrncpy(ncp, gt, ncp_len);
             esc_len = HDstrlen(gt);
-        } 
+        }
         else if (*cp == '\"') {
             HDstrncpy(ncp, quote, ncp_len);
             esc_len = HDstrlen(quote);
-        } 
+        }
         else if (*cp == '&') {
             HDstrncpy(ncp, amp, ncp_len);
             esc_len = HDstrlen(amp);
-        } 
+        }
         else {
             *ncp = *cp;
             esc_len = 1;
@@ -730,9 +719,6 @@ xml_escape_the_name(const char *str)
  * Return:      The revised string.
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static char                   *
@@ -838,9 +824,6 @@ xml_escape_the_string(const char *str, int slen)
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -865,12 +848,12 @@ xml_print_datatype(hid_t type, unsigned in_group)
     size_t                  mpos;
     size_t                  msize;
     int                     nmembs;
-    htri_t                  is_vlstr=FALSE;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
-    h5tool_format_t  *outputformat = &xml_dataformat;
-    h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    htri_t                  is_vlstr = FALSE;
+    h5tools_str_t           buffer;          /* string into which to render   */
+    h5tools_context_t       ctx;             /* print context  */
+    h5tool_format_t        *outputformat = &xml_dataformat;
+    h5tool_format_t         string_dataformat;
+    hsize_t                 curr_pos = 0;     /* total data element position   */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -878,7 +861,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -923,7 +906,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 h5tools_str_append(&buffer, "<%sNamedDataTypePtr OBJ-XID=\"/%s\"/>",
                         xmlnsprefix, dtxid);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-            } 
+            }
             else {
                 /* point to the NDT by name */
                 char *t_objname = xml_escape_the_name(found_obj->objname);
@@ -939,7 +922,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 HDfree(t_objname);
             }
             HDfree(dtxid);
-        } 
+        }
         else {
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -950,7 +933,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
             h5tools_setstatus(EXIT_FAILURE);
         }
-    } 
+    }
     else {
         switch (H5Tget_class(type)) {
             case H5T_INTEGER:
@@ -988,9 +971,9 @@ xml_print_datatype(hid_t type, unsigned in_group)
                         h5tools_str_append(&buffer, "ERROR_UNKNOWN");
                         break;
                 } /* end switch */
-                
+
                 h5tools_str_append(&buffer, "\" Sign=\"");
-                
+
                 switch (sgn) {
                     case H5T_SGN_NONE:
                         h5tools_str_append(&buffer, "false");
@@ -1004,7 +987,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                         h5tools_str_append(&buffer, "ERROR_UNKNOWN");
                         break;
                 } /* end switch */
-                
+
                 h5tools_str_append(&buffer, "\" Size=\"");
                 sz = H5Tget_size(type);
                 h5tools_str_append(&buffer, "%lu", (unsigned long)sz);
@@ -1043,7 +1026,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sFloatType ByteOrder=\"",xmlnsprefix);
-                
+
                 switch (ord) {
                     case H5T_ORDER_LE:
                         h5tools_str_append(&buffer, "LE");
@@ -1060,7 +1043,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     default:
                         h5tools_str_append(&buffer, "ERROR_UNKNOWN");
                 } /* end switch */
-                
+
                 h5tools_str_append(&buffer, "\" Size=\"");
                 sz = H5Tget_size(type);
                 h5tools_str_append(&buffer, "%lu", (unsigned long)sz);
@@ -1182,7 +1165,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sBitfieldType ByteOrder=\"",xmlnsprefix);
-                
+
                 switch (ord) {
                     case H5T_ORDER_LE:
                         h5tools_str_append(&buffer, "LE");
@@ -1197,7 +1180,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     default:
                         h5tools_str_append(&buffer, "ERROR_UNKNOWN");
                 } /* end switch */
-                
+
                 size = H5Tget_size(type);
                 h5tools_str_append(&buffer, "\" Size=\"%lu\"/>", (unsigned long)size);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -1559,19 +1542,16 @@ xml_print_datatype(hid_t type, unsigned in_group)
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
 xml_dump_datatype(hid_t type)
 {
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -1579,7 +1559,7 @@ xml_dump_datatype(hid_t type)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -1629,7 +1609,7 @@ xml_dump_datatype(hid_t type)
                 h5tools_str_append(&buffer, "<%sNamedDataTypePtr OBJ-XID=\"%s\"/>",
                         xmlnsprefix, dtxid);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-            } 
+            }
             else {
                 /* pointer to a named datatype already in XML */
                 char *t_objname = xml_escape_the_name(found_obj->objname);
@@ -1645,7 +1625,7 @@ xml_dump_datatype(hid_t type)
                 HDfree(t_objname);
             }
             HDfree(dtxid);
-        } 
+        }
         else {
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -1692,25 +1672,22 @@ xml_dump_datatype(hid_t type)
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
 xml_dump_dataspace(hid_t space)
 {
-    hsize_t         size[H5DUMP_MAX_RANK];
-    hsize_t         maxsize[H5DUMP_MAX_RANK];
-    int             i;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    hsize_t           size[H5DUMP_MAX_RANK];
+    hsize_t           maxsize[H5DUMP_MAX_RANK];
+    int               i;
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
-    
-    int             ndims = H5Sget_simple_extent_dims(space, size, maxsize);
-    H5S_class_t     space_type = H5Sget_simple_extent_type(space);
+    hsize_t           curr_pos = 0;    /* total data element position   */
+
+    int               ndims = H5Sget_simple_extent_dims(space, size, maxsize);
+    H5S_class_t       space_type = H5Sget_simple_extent_type(space);
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -1718,7 +1695,7 @@ xml_dump_dataspace(hid_t space)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -1784,7 +1761,7 @@ xml_dump_dataspace(hid_t space)
                 h5tools_str_append(&buffer, "<%sDimension  DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" MaxDimSize=\"UNLIMITED\"/>",
                         xmlnsprefix,size[i]);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-            } 
+            }
             else if (maxsize[i] == (hsize_t) 0) {
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -1794,7 +1771,7 @@ xml_dump_dataspace(hid_t space)
                 h5tools_str_append(&buffer, "<%sDimension  DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" MaxDimSize=\"%" H5_PRINTF_LL_WIDTH "u\"/>",
                         xmlnsprefix,size[i], size[i]);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-            } 
+            }
             else {
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -1868,9 +1845,6 @@ xml_dump_dataspace(hid_t space)
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -1886,19 +1860,19 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
     int                 status = -1;
     void               *buf = NULL;
     hsize_t             curr_pos = 0;        /* total data element position   */
-    h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;             /* print context  */
+    h5tools_str_t       buffer;              /* string into which to render   */
+    h5tools_context_t   ctx;                 /* print context  */
     h5tool_format_t    *outputformat = &xml_dataformat;
     h5tool_format_t     string_dataformat;
 
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     /* Print all the values. */
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -1922,7 +1896,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "<%sData>", xmlnsprefix);
@@ -1932,14 +1906,14 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "<%sDataFromFile>", xmlnsprefix);
     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
     ctx.indent_level--;
-    
+
     dump_indent += COL;
     ctx.indent_level++;
 
@@ -1957,7 +1931,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
             datactx.cur_column = ctx.cur_column;
             status = h5tools_dump_dset(rawoutstream, outputformat, &datactx, obj_id, NULL);
         }
-    } 
+    }
     else {
         /* Attribute data */
         type = H5Aget_type(obj_id);
@@ -1970,15 +1944,15 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
              */
             status = xml_print_refs(obj_id, ATTRIBUTE_DATA);
             H5Tclose(type);
-        } 
+        }
         else if (H5Tget_class(type) == H5T_STRING) {
             status = xml_print_strs(obj_id, ATTRIBUTE_DATA);
-        } 
+        }
         else {  /* all other data */
             /* VL data special information */
             unsigned int vl_data = 0; /* contains VL datatypes */
-            
-            p_type = h5tools_get_native_type(type);
+
+            p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
             /* Check if we have VL data in the dataset's datatype */
             if (h5tools_detect_vlen(p_type) == TRUE)
@@ -1995,7 +1969,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
 
             buf = HDmalloc((size_t)(nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type))));
             HDassert(buf);
-            
+
             if (H5Aread(obj_id, p_type, buf) >= 0) {
                 h5tools_context_t datactx;
                 HDmemset(&datactx, 0, sizeof(datactx));
@@ -2020,7 +1994,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-        
+
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "Unable to print data.");
@@ -2036,7 +2010,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
     ctx.indent_level++;
 
     ctx.need_prefix = TRUE;
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "</%sDataFromFile>",xmlnsprefix);
@@ -2046,7 +2020,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "</%sData>", xmlnsprefix);
@@ -2063,9 +2037,6 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
  * Return:      herr_t
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -2077,11 +2048,11 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
     hid_t             space = -1;
     H5S_class_t       space_type;
     hsize_t           curr_pos = 0;        /* total data element position   */
-    h5tools_str_t     buffer;          /* string into which to render   */
-    h5tools_context_t ctx;           /* print context  */
+    h5tools_str_t     buffer;              /* string into which to render   */
+    h5tools_context_t ctx;                 /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    
+
     char *t_aname = xml_escape_the_name(attr_name);
 
     /* setup */
@@ -2090,7 +2061,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -2110,7 +2081,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "<%sAttribute Name=\"%s\">", xmlnsprefix, t_aname);
@@ -2146,7 +2117,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sData>", xmlnsprefix);
@@ -2154,7 +2125,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<!-- Time data not yet implemented. -->");
@@ -2162,7 +2133,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sNoData/>", xmlnsprefix);
@@ -2170,7 +2141,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<hdf5:Data>");
@@ -2178,7 +2149,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "</%sData>", xmlnsprefix);
@@ -2191,7 +2162,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             case H5T_COMPOUND:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<!-- Note: format of compound data not specified -->");
@@ -2202,7 +2173,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             case H5T_REFERENCE:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sData>", xmlnsprefix);
@@ -2210,7 +2181,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 if (!H5Tequal(type, H5T_STD_REF_OBJ)) {
                     ctx.need_prefix = TRUE;
                     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                    
+
                     /* Render the element */
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "<!-- Note: Region references not supported -->");
@@ -2218,7 +2189,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                     ctx.need_prefix = TRUE;
                     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                    
+
                     /* Render the element */
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "<%sNoData />", xmlnsprefix);
@@ -2227,7 +2198,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 else {
                     ctx.need_prefix = TRUE;
                     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                    
+
                     /* Render the element */
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "<%sDataFromFile>", xmlnsprefix);
@@ -2237,7 +2208,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                     ctx.need_prefix = TRUE;
                     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                    
+
                     /* Render the element */
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "</%sDataFromFile>", xmlnsprefix);
@@ -2246,7 +2217,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "</%sData>", xmlnsprefix);
@@ -2256,7 +2227,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             case H5T_VLEN:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<!-- Note: format of VL data not specified -->");
@@ -2271,7 +2242,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
             default:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sData>", xmlnsprefix);
@@ -2279,7 +2250,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<!-- Unknown datatype: %d -->", H5Tget_class(type));
@@ -2287,7 +2258,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sNoData/>", xmlnsprefix);
@@ -2295,7 +2266,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "</%sData>", xmlnsprefix);
@@ -2308,7 +2279,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
              * Or dataspace is H5S_NULL. */
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-            
+
             /* Render the element */
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "<%sData>", xmlnsprefix);
@@ -2318,7 +2289,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-            
+
             /* Render the element */
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "<%sNoData/>", xmlnsprefix);
@@ -2328,7 +2299,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-            
+
             /* Render the element */
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "</%sData>", xmlnsprefix);
@@ -2343,7 +2314,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-        
+
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "</%sAttribute>", xmlnsprefix);
@@ -2358,7 +2329,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-        
+
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "<!-- h5dump error: unable to open attribute. -->");
@@ -2368,14 +2339,14 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-        
+
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "</%sAttribute>", xmlnsprefix);
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
         h5tools_str_close(&buffer);
-        
+
         h5tools_setstatus(EXIT_FAILURE);
         return FAIL;
     }
@@ -2389,17 +2360,14 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
  * Return:      herr_t
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 void
 xml_dump_named_datatype(hid_t type, const char *name)
 {
     hsize_t           curr_pos = 0;        /* total data element position   */
-    h5tools_str_t     buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    h5tools_str_t     buffer;              /* string into which to render   */
+    h5tools_context_t ctx;                 /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
     char             *tmp;
@@ -2420,7 +2388,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -2458,7 +2426,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-        
+
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "<%sNamedDataType Name=\"%s\" OBJ-XID=\"%s\" "
@@ -2467,13 +2435,13 @@ xml_dump_named_datatype(hid_t type, const char *name)
                 name, dtxid,
                 parentxid, HDstrcmp(prefix,"") ? t_prefix : "/");
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-    } 
+    }
     else {
         H5O_info_t  oinfo;          /* Object info */
 
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-        
+
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "<%sNamedDataType Name=\"%s\" OBJ-XID=\"%s\" "
@@ -2496,7 +2464,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
                 error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
                 h5tools_setstatus(EXIT_FAILURE);
                 goto done;
-            } 
+            }
             else if(found_obj->displayed) {
                 /* We have already printed this named datatype, print it as a
                  * NamedDatatypePtr
@@ -2505,29 +2473,29 @@ xml_dump_named_datatype(hid_t type, const char *name)
                 char *t_objname = xml_escape_the_name(found_obj->objname);
 
                 ctx.indent_level++;
-                
+
                 xml_name_to_XID(found_obj->objname, pointerxid, (int)sizeof(pointerxid), 1);
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "<%sNamedDatatypePtr OBJ-XID=\"%s\" H5Path=\"%s\"/>", xmlnsprefix, pointerxid, t_objname);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-                
+
                 ctx.indent_level--;
 
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-                
+
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "</%sNamedDataType>", xmlnsprefix);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 HDfree(t_objname);
                 goto done;
-            } 
+            }
             else
                 found_obj->displayed = TRUE;
         }
@@ -2538,7 +2506,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "<%sDataType>",xmlnsprefix);
@@ -2549,10 +2517,10 @@ xml_dump_named_datatype(hid_t type, const char *name)
     xml_print_datatype(type,1);
     ctx.indent_level--;
     dump_indent -= COL;
-    
+
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "</%sDataType>",xmlnsprefix);
@@ -2563,7 +2531,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-    
+
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "</%sNamedDataType>",xmlnsprefix);
@@ -2589,11 +2557,6 @@ done:
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *  Pedro Vicente, October 9, 2007
- *   added parameters to H5A(L)iterate to allow for other iteration orders
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -2611,11 +2574,11 @@ xml_dump_group(hid_t gid, const char *name)
     char                   *cp = NULL;
     char                   *tmp = NULL;
     char                   *par = NULL;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
-    h5tool_format_t  *outputformat = &xml_dataformat;
-    h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    h5tools_str_t           buffer;          /* string into which to render   */
+    h5tools_context_t       ctx;             /* print context  */
+    h5tool_format_t        *outputformat = &xml_dataformat;
+    h5tool_format_t         string_dataformat;
+    hsize_t                 curr_pos = 0;    /* total data element position   */
 
     if ((gcpl_id = H5Gget_create_plist(gid)) < 0) {
         error_msg("error in getting group creation property list ID\n");
@@ -2645,7 +2608,7 @@ xml_dump_group(hid_t gid, const char *name)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -2733,7 +2696,7 @@ xml_dump_group(hid_t gid, const char *name)
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                     HDfree(t_objname);
                     HDfree(par_name);
-                    
+
                     ctx.indent_level++;
 
                     t_objname = xml_escape_the_name(found_obj->objname);/* point to the NDT by name */
@@ -2751,7 +2714,7 @@ xml_dump_group(hid_t gid, const char *name)
                                 xmlnsprefix,
                                 ptrstr, t_objname, parentxid, par_name);
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-                    
+
                     ctx.indent_level--;
 
                     HDfree(t_objname);
@@ -2797,7 +2760,7 @@ xml_dump_group(hid_t gid, const char *name)
                 found_obj->displayed = TRUE;
 
                 /* 1.  do all the attributes of the group */
-                
+
                 ctx.indent_level++;
                 dump_indent += COL;
 
@@ -2880,7 +2843,7 @@ xml_dump_group(hid_t gid, const char *name)
         HDfree(parentxid);
 
         /* 1.  do all the attributes of the group */
-        
+
         ctx.indent_level++;
         dump_indent += COL;
 
@@ -2936,7 +2899,7 @@ xml_dump_group(hid_t gid, const char *name)
     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
     h5tools_str_close(&buffer);
-    
+
     if(par)
         HDfree(par);
     if(tmp)
@@ -2951,27 +2914,24 @@ xml_dump_group(hid_t gid, const char *name)
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 xml_print_refs(hid_t did, int source)
 {
-    herr_t      e;
-    hid_t       type    = -1;
-    hid_t       space   = -1;
-    hssize_t    ssiz    = -1;
-    hsize_t     i;
-    size_t      tsiz;
-    hobj_ref_t *refbuf = NULL;
-    char       *buf = NULL;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    herr_t            e;
+    hid_t             type    = -1;
+    hid_t             space   = -1;
+    hssize_t          ssiz    = -1;
+    hsize_t           i;
+    size_t            tsiz;
+    hobj_ref_t       *refbuf = NULL;
+    char             *buf = NULL;
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     if (source == DATASET_DATA) {
         type = H5Dget_type(did);
@@ -3031,7 +2991,7 @@ xml_print_refs(hid_t did, int source)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -3085,7 +3045,7 @@ xml_print_refs(hid_t did, int source)
     H5Tclose(type);
     H5Sclose(space);
     return SUCCEED;
-    
+
 error:
     if(buf)
         HDfree(buf);
@@ -3105,30 +3065,27 @@ error:
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static int
 xml_print_strs(hid_t did, int source)
 {
-    herr_t      e;
-    hid_t       type    = -1;
-    hid_t       space   = -1;
-    hssize_t    ssiz    = -1;
-    htri_t      is_vlstr = FALSE;
-    size_t      tsiz    = 0;
-    hsize_t     i;
-    size_t      str_size = 0;
-    char       *bp = NULL;
-    char       *onestring = NULL;
-    void       *buf = NULL;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    herr_t            e;
+    hid_t             type    = -1;
+    hid_t             space   = -1;
+    hssize_t          ssiz    = -1;
+    htri_t            is_vlstr = FALSE;
+    size_t            tsiz    = 0;
+    hsize_t           i;
+    size_t            str_size = 0;
+    char             *bp = NULL;
+    char             *onestring = NULL;
+    void             *buf = NULL;
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     if (source == DATASET_DATA)
         type = H5Dget_type(did);
@@ -3184,7 +3141,7 @@ xml_print_strs(hid_t did, int source)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -3252,7 +3209,7 @@ xml_print_strs(hid_t did, int source)
     H5Tclose(type);
     H5Sclose(space);
     return SUCCEED;
-    
+
 error:
     if(buf)
         HDfree(buf);
@@ -3273,26 +3230,23 @@ error:
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
 check_filters(hid_t dcpl)
 {
-    int             nfilt;
-    int             i;
-    H5Z_filter_t    filter;
-    char            namebuf[120];
-    size_t          cd_nelmts = 20;
-    unsigned int    cd_values[20];
-    unsigned int    flags;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    int               nfilt;
+    int               i;
+    H5Z_filter_t      filter;
+    char              namebuf[120];
+    size_t            cd_nelmts = 20;
+    unsigned int      cd_values[20];
+    unsigned int      flags;
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -3300,7 +3254,7 @@ check_filters(hid_t dcpl)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -3423,16 +3377,16 @@ check_filters(hid_t dcpl)
 static void
 xml_dump_fill_value(hid_t dcpl, hid_t type)
 {
-    size_t      sz;
-    size_t      i;
-    hsize_t     space;
-    void       *buf;
-    char       *name;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
+    size_t            sz;
+    size_t            i;
+    hsize_t           space;
+    void             *buf;
+    char             *name;
+    h5tools_str_t     buffer;          /* string into which to render   */
+    h5tools_context_t ctx;             /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
     h5tool_format_t   string_dataformat;
-    hsize_t           curr_pos = 0;        /* total data element position   */
+    hsize_t           curr_pos = 0;    /* total data element position   */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -3440,7 +3394,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -3452,7 +3406,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         string_dataformat.line_ncols = 65535;
         string_dataformat.line_per_line = 1;
     }
-    else 
+    else
         string_dataformat.line_ncols = h5tools_nCols;
 
     string_dataformat.do_escape = display_escape;
@@ -3764,11 +3718,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *  Pedro Vicente, October 9, 2007
- *   added parameters to H5Aiterate2 to allow for other iteration orders
- *
  *-------------------------------------------------------------------------
  */
 void
@@ -3791,11 +3740,11 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     char               *t_prefix;
     unsigned            attr_crt_order_flags;
     h5tools_str_t       buffer;          /* string into which to render   */
-    h5tools_context_t   ctx;            /* print context  */
+    h5tools_context_t   ctx;             /* print context  */
     h5tool_format_t    *outputformat = &xml_dataformat;
     h5tool_format_t     string_dataformat;
-    hsize_t             curr_pos = 0;        /* total data element position   */
-    
+    hsize_t             curr_pos = 0;    /* total data element position   */
+
     char *rstr = (char*) HDmalloc((size_t)100);
     char *pstr = (char*) HDmalloc((size_t)100);
 
@@ -3814,7 +3763,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
     t_name = xml_escape_the_name(name);
     t_tmp = xml_escape_the_name(tmp);
     t_prefix = xml_escape_the_name(prefix);
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -3925,7 +3874,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
 
         ctx.indent_level--;
         dump_indent -= COL;
-        
+
         ctx.need_prefix = TRUE;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
@@ -4376,9 +4325,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
  * Return:      void
  *
  * Programmer:  REMcG
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -4392,11 +4338,11 @@ xml_print_enum(hid_t type)
     size_t              dst_size;       /*destination value type size    */
     unsigned            i;              /*miscellaneous counters         */
     size_t              j;
-    h5tools_str_t buffer;          /* string into which to render   */
-    h5tools_context_t ctx;            /* print context  */
-    h5tool_format_t  *outputformat = &xml_dataformat;
-    h5tool_format_t   string_dataformat;
-    hsize_t     curr_pos = 0;        /* total data element position   */
+    h5tools_str_t       buffer;         /* string into which to render   */
+    h5tools_context_t   ctx;            /* print context  */
+    h5tool_format_t    *outputformat = &xml_dataformat;
+    h5tool_format_t     string_dataformat;
+    hsize_t             curr_pos = 0;   /* total data element position   */
 
     /* setup */
     HDmemset(&buffer, 0, sizeof(h5tools_str_t));
@@ -4404,7 +4350,7 @@ xml_print_enum(hid_t type)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent / COL;
     ctx.cur_column = dump_indent;
-    
+
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -4455,11 +4401,11 @@ xml_print_enum(hid_t type)
 
         if (H5T_SGN_NONE == H5Tget_sign(type)) {
             native = H5T_NATIVE_ULLONG;
-        } 
+        }
         else {
             native = H5T_NATIVE_LLONG;
         }
-    } 
+    }
     else {
         dst_size = H5Tget_size(type);
     }
@@ -4530,11 +4476,11 @@ xml_print_enum(hid_t type)
 
             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)) {
             h5tools_str_append(&buffer,"%" H5_PRINTF_LL_WIDTH "u", *((unsigned long long *)
                        ((void *) (value + i * dst_size))));
-        } 
+        }
         else {
             h5tools_str_append(&buffer,"%" H5_PRINTF_LL_WIDTH "d",
                       *((long long *) ((void *) (value + i * dst_size))));
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 8e28d82..8c18794 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -1620,7 +1620,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
         if(hexdump_g)
            p_type = H5Tcopy(type);
         else
-           p_type = h5tools_get_native_type(type);
+           p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
         if(p_type >= 0) {
             /* VL data special information */
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 2c38d94..408142c 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -25,7 +25,7 @@ static const char* MapIdToName(hid_t refobj_id,trav_table_t *travt);
 static int copy_refs_attr(hid_t loc_in, hid_t loc_out, pack_opt_t *options,
                           trav_table_t *travt, hid_t fidout);
 static herr_t update_ref_value(hid_t obj_id, H5R_type_t ref_type, void *ref_in,
-		hid_t fid_out, void *ref_out, trav_table_t *travt);
+        hid_t fid_out, void *ref_out, trav_table_t *travt);
 
 /*-------------------------------------------------------------------------
  * Function: do_copy_refobjs
@@ -126,8 +126,8 @@ int do_copy_refobjs(hid_t fidin,
                 for(k = 0; k < rank; k++)
                     nelmts *= dims[k];
 
-                if((mtype_id = h5tools_get_native_type(ftype_id)) < 0)
-                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5tools_get_native_type failed");
+                if((mtype_id = H5Tget_native_type(ftype_id, H5T_DIR_DEFAULT)) < 0)
+                    HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
                 if((msize = H5Tget_size(mtype_id)) == 0)
                     HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
@@ -425,13 +425,13 @@ done:
  * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
  *
  * Modifier: xcao@hdfgroup.org, 9/12/2011
- * 	         Update values of references(object and region) for the following types:
+ *              Update values of references(object and region) for the following types:
  *               1) References,
  *               2) ARRAY of reference,
  *               3) VLEN of references.
  *               4) COMPOUND of references.
  *          This function does not handle references in other complicated structures,
- *		    such as references in nested compound datatypes.
+ *            such as references in nested compound datatypes.
  *
  * Date: October, 28, 2003
  *
@@ -472,7 +472,7 @@ static int copy_refs_attr(hid_t loc_in,
         HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Oget_info failed");
 
     for(u = 0; u < (unsigned)oinfo.num_attrs; u++) {
-    	is_ref = is_ref_vlen = is_ref_array = is_ref_comp = 0;
+        is_ref = is_ref_vlen = is_ref_array = is_ref_comp = 0;
 
         /* open attribute */
         if((attr_id = H5Aopen_by_idx(loc_in, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -484,8 +484,8 @@ static int copy_refs_attr(hid_t loc_in,
 
         type_class = H5Tget_class(ftype_id);
 
-        if((mtype_id = h5tools_get_native_type(ftype_id)) < 0)
-            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "h5tools_get_native_type failed");
+        if((mtype_id = H5Tget_native_type(ftype_id, H5T_DIR_DEFAULT)) < 0)
+            HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_native_type failed");
 
         if((msize = H5Tget_size(mtype_id)) == 0)
             HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Tget_size failed");
@@ -528,9 +528,9 @@ static int copy_refs_attr(hid_t loc_in,
                 }
                 H5Tclose(mtid);
             }
-            
-            /* if compound don't contain reference type member, free the above 
-             * mallocs. Otherwise there can be memory leaks by the 'continue' 
+
+            /* if compound don't contain reference type member, free the above
+             * mallocs. Otherwise there can be memory leaks by the 'continue'
              * statement below. */
             if (!ref_comp_field_n) {
                 if (ref_comp_index) {
@@ -539,7 +539,7 @@ static int copy_refs_attr(hid_t loc_in,
                 }
 
                 if (ref_comp_size) {
-            	    HDfree(ref_comp_size);
+                    HDfree(ref_comp_size);
                     ref_comp_size = NULL;
                 }
             }
@@ -588,7 +588,7 @@ static int copy_refs_attr(hid_t loc_in,
             array_rank = (unsigned)H5Tget_array_ndims(mtype_id);
             H5Tget_array_dims2(mtype_id, array_dims);
             for(j = 0; j <array_rank; j++)
-            	array_size *= array_dims[j];
+                array_size *= array_dims[j];
             nelmts *= array_size;
         }
 
@@ -648,7 +648,7 @@ static int copy_refs_attr(hid_t loc_in,
                 }
             } /* H5T_STD_REF_DSETREG */
             else if (is_ref_vlen) {
-            	/* handle VLEN of references */
+                /* handle VLEN of references */
 
                 buf = (hvl_t *)HDmalloc((unsigned)(nelmts * sizeof(hvl_t)));
                 refbuf = buf; /* reuse the read buffer for write */
@@ -688,7 +688,7 @@ static int copy_refs_attr(hid_t loc_in,
                 }
             } /* else if (is_ref_vlen) */
             else if (is_ref_comp) {
-            	/* handle ref fields in a compound */
+                /* handle ref fields in a compound */
 
                 buf = HDmalloc((unsigned)(nelmts * msize));
                 refbuf = buf; /* reuse the read buffer for write */
@@ -728,7 +728,7 @@ static int copy_refs_attr(hid_t loc_in,
                 HGOTO_ERROR(FAIL, H5E_tools_min_id_g, "H5Awrite failed");
 
             if (is_ref_vlen && buf)
-            	H5Dvlen_reclaim (mtype_id, space_id, H5P_DEFAULT, buf);
+                H5Dvlen_reclaim (mtype_id, space_id, H5P_DEFAULT, buf);
         } /* if (nelmts) */
 
         if (refbuf == buf)
@@ -780,10 +780,10 @@ done:
         HDfree(buf);
 
     if (ref_comp_index)
-    	HDfree(ref_comp_index);
+        HDfree(ref_comp_index);
 
     if (ref_comp_size)
-    	HDfree(ref_comp_size);
+        HDfree(ref_comp_size);
 
     H5E_BEGIN_TRY {
         H5Tclose(ftype_id);
@@ -797,9 +797,9 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	MapIdToName
+ * Function:    MapIdToName
  *
- * Purpose:	map a ID from a reference to a dataset name
+ * Purpose:    map a ID from a reference to a dataset name
  *
  *-------------------------------------------------------------------------
  */
@@ -832,16 +832,16 @@ out:
 }
 
 /*-------------------------------------------------------------------------
- * Function:	Update_Ref_value
+ * Function:    Update_Ref_value
  *
- * Purpose:	Update a reference value
+ * Purpose:    Update a reference value
  *
  * Programmer: xcao@hdfgroup.org 9/12/2011
  *
  *-------------------------------------------------------------------------
  */
 static herr_t update_ref_value(hid_t obj_id, H5R_type_t ref_type, void *ref_in,
-		hid_t fid_out, void *ref_out, trav_table_t *travt)
+        hid_t fid_out, void *ref_out, trav_table_t *travt)
 {
     int    ret_value = 0; /*no need to LEAVE() on ERROR: HERR_INIT(int, SUCCEED) */
     const char* ref_obj_name;
diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c
index ed41998..bda0686 100644
--- a/tools/test/h5copy/h5copygentest.c
+++ b/tools/test/h5copy/h5copygentest.c
@@ -33,12 +33,12 @@
 #define DATASET_COMPRESSED      "compressed"
 #define DATASET_NAMED_VL        "named_vl"
 #define DATASET_NESTED_VL       "nested_vl"
-#define DATASET_ATTR		"dset_attr"
-#define ATTR			"attr"
+#define DATASET_ATTR            "dset_attr"
+#define ATTR                    "attr"
 #define GROUP_EMPTY             "grp_empty"
 #define GROUP_DATASETS          "grp_dsets"
 #define GROUP_NESTED            "grp_nested"
-#define GROUP_ATTR		"grp_attr"
+#define GROUP_ATTR              "grp_attr"
 
 /* Obj reference */
 #define OBJ_REF_DS "Dset1"
@@ -327,8 +327,8 @@ static void gent_nested_vl(hid_t loc_id)
  * Function:    gent_att_compound_vlstr
  *
  * Purpose:     Generate a dataset and a group.
- *		Both has an attribute with a compound datatype consisting 
- *		of a variable length string
+ *              Both has an attribute with a compound datatype consisting 
+ *              of a variable length string
  *
  *-------------------------------------------------------------------------
  */
@@ -347,7 +347,7 @@ static void gent_att_compound_vlstr(hid_t loc_id)
     hid_t vl_str_tid = -1;	/* Variable length datatype ID */
     hid_t cmpd_tid = -1;	/* Compound datatype ID */
     hid_t null_sid = -1;	/* Null dataspace ID */
-    s1 buf;			/* Buffer */
+    s1 buf;                 /* Buffer */
 
     buf.i = 9;
     buf.v = "ThisIsAString";
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in
index ace3981..203bfef 100644
--- a/tools/test/h5copy/testh5copy.sh.in
+++ b/tools/test/h5copy/testh5copy.sh.in
@@ -381,6 +381,8 @@ CMP_OUTPUT()
         # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     else
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index 0390c40..212f5d6 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -242,6 +242,8 @@ TOOLTEST() {
         # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     elif test $h5haveexitcode = 'yes' -a -z "$pmode"; then
diff --git a/tools/test/h5diff/testfiles/diff_strings1.h5 b/tools/test/h5diff/testfiles/diff_strings1.h5
index 8839f5a..0f8b380 100644
--- a/tools/test/h5diff/testfiles/diff_strings1.h5
+++ b/tools/test/h5diff/testfiles/diff_strings1.h5
diff --git a/tools/test/h5diff/testfiles/diff_strings2.h5 b/tools/test/h5diff/testfiles/diff_strings2.h5
index 810278c..e8520ae 100644
--- a/tools/test/h5diff/testfiles/diff_strings2.h5
+++ b/tools/test/h5diff/testfiles/diff_strings2.h5
diff --git a/tools/test/h5diff/testfiles/h5diff_dset1.h5 b/tools/test/h5diff/testfiles/h5diff_dset1.h5
index a587403..fefd86a 100644
--- a/tools/test/h5diff/testfiles/h5diff_dset1.h5
+++ b/tools/test/h5diff/testfiles/h5diff_dset1.h5
diff --git a/tools/test/h5diff/testfiles/h5diff_dset2.h5 b/tools/test/h5diff/testfiles/h5diff_dset2.h5
index c38ed4a..598e481 100644
--- a/tools/test/h5diff/testfiles/h5diff_dset2.h5
+++ b/tools/test/h5diff/testfiles/h5diff_dset2.h5
diff --git a/tools/test/h5diff/testfiles/h5diff_dset3.h5 b/tools/test/h5diff/testfiles/h5diff_dset3.h5
index 4714d07..893c135 100644
--- a/tools/test/h5diff/testfiles/h5diff_dset3.h5
+++ b/tools/test/h5diff/testfiles/h5diff_dset3.h5
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 86658e2..d769c23 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -502,6 +502,8 @@ TOOLTEST() {
         # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     elif test $h5haveexitcode = 'yes' -a -z "$pmode"; then
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index f17b116..ae4649a 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -62,7 +62,8 @@
       ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl
       ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl
       ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_be.ddl
+      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_le.ddl
       ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl
       ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl
       ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl
@@ -810,8 +811,10 @@
           tbinregR.out.err
           tbigdims.out
           tbigdims.out.err
-          tbitnopaque.out
-          tbitnopaque.out.err
+          tbitnopaque_be.out
+          tbitnopaque_be.out.err
+          tbitnopaque_le.out
+          tbitnopaque_le.out.err
           tboot1.out
           tboot1.out.err
           tboot2.out
@@ -1172,7 +1175,11 @@
   ADD_H5_TEST (tcomp-4 0 --enable-error-stack tcompound_complex.h5)
   ADD_H5_TEST (tcompound_complex2 0 --enable-error-stack tcompound_complex2.h5)
   # tests for bitfields and opaque data types
-  ADD_H5_TEST (tbitnopaque 0 --enable-error-stack tbitnopaque.h5)
+  if (H5_WORDS_BIGENDIAN)
+    ADD_H5_TEST (tbitnopaque_be 0 --enable-error-stack tbitnopaque.h5)
+  else ()
+    ADD_H5_TEST (tbitnopaque_le 0 --enable-error-stack tbitnopaque.h5)
+  endif ()
 
   #test for the nested compound type
   ADD_H5_TEST (tnestcomp-1 0 --enable-error-stack tnestedcomp.h5)
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index c353e48..92e08a0 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -81,7 +81,8 @@
       ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_be.h5.xml
+      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_le.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml
       ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml
@@ -221,8 +222,10 @@
           tarray7.h5.out.err
           tattr.h5.out
           tattr.h5.out.err
-          tbitfields.h5.out
-          tbitfields.h5.out.err
+          tbitfields_be.h5.out
+          tbitfields_be.h5.out.err
+          tbitfields_le.h5.out
+          tbitfields_le.h5.out.err
           tcompound.h5.out
           tcompound.h5.out.err
           tcompound2.h5.out
@@ -344,7 +347,11 @@
   ########## test XML
   ADD_XML_H5_TEST (tall.h5 0 tall.h5)
   ADD_XML_H5_TEST (tattr.h5 0 tattr.h5)
-  ADD_XML_H5_TEST (tbitfields.h5 0 tbitfields.h5)
+  if (H5_WORDS_BIGENDIAN)
+    ADD_XML_H5_TEST (tbitfields_be.h5 0 tbitfields.h5)
+  else ()
+    ADD_XML_H5_TEST (tbitfields_le.h5 0 tbitfields.h5)
+  endif ()
   ADD_XML_H5_TEST (tcompound.h5 0 tcompound.h5)
   ADD_XML_H5_TEST (tcompound2.h5 0 tcompound2.h5)
   ADD_XML_H5_TEST (tdatareg.h5 0 tdatareg.h5)
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index e7ac564..6a00a16 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -196,6 +196,8 @@ TOOLTEST() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual > /dev/null 2>&1 ; then
      echo " PASSED"
     else
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 48bc27d..169eddb 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -9717,18 +9717,19 @@ static void gent_bitnopaquefields(void)
     /* Compound datatype */
     typedef struct s_t
     {
-        unsigned char   a;
-        unsigned int    b;
-        unsigned long    c;
-        unsigned long long    d;
+        uint8_t     a;
+        uint16_t    b;
+        uint32_t    c;
+        uint64_t    d;
     } s_t;
+    
     hid_t  file, grp=-1, type=-1, space=-1, dset=-1;
     size_t  i;
     hsize_t  nelmts = F80_DIM32;
-    unsigned char buf[F80_DIM32];    /* bitfield, opaque */
-    unsigned int buf2[F80_DIM32];    /* bitfield, opaque */
-    unsigned long buf3[F80_DIM32];    /* bitfield, opaque */
-    unsigned long long buf4[F80_DIM32];    /* bitfield, opaque */
+    uint8_t buf[F80_DIM32];    /* bitfield, opaque */
+    uint16_t buf2[F80_DIM32];    /* bitfield, opaque */
+    uint32_t buf3[F80_DIM32];    /* bitfield, opaque */
+    uint64_t buf4[F80_DIM32];    /* bitfield, opaque */
     s_t      buf5[F80_DIM32];        /* compound */
 
     file = H5Fcreate(FILE80, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -9739,7 +9740,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf[i] = (unsigned char)0xff ^ (unsigned char)i;
+                        buf[i] = (uint8_t)0xff ^ (uint8_t)i;
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
                     H5Dclose(dset);
@@ -9754,7 +9755,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf2[i] = (unsigned int)0xffff ^ (unsigned int)(i * 16);
+                        buf2[i] = (uint16_t)0xffff ^ (uint16_t)(i * 16);
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
                     H5Dclose(dset);
@@ -9769,7 +9770,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_3", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf3[i] = (unsigned long)0xffffffff ^ (unsigned long)(i * 32);
+                        buf3[i] = (uint32_t)0xffffffff ^ (uint32_t)(i * 32);
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf3);
                     H5Dclose(dset);
@@ -9784,7 +9785,7 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "bitfield_4", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for (i = 0; i < nelmts; i++) {
-                        buf4[i] = (unsigned long long)0xffffffffffffffff ^ (unsigned long long)(i * 64);
+                        buf4[i] = (uint64_t)0xffffffffffffffff ^ (uint64_t)(i * 64);
                     }
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf4);
                     H5Dclose(dset);
@@ -9804,7 +9805,7 @@ static void gent_bitnopaquefields(void)
                 if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                     if ((dset = H5Dcreate2(grp, "opaque_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                         for(i = 0; i < nelmts; i++)
-                            buf[i] = (unsigned char)0xff ^ (unsigned char)i;
+                            buf[i] = (uint8_t)0xff ^ (uint8_t)i;
                         H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf);
                         H5Dclose(dset);
                     }
@@ -9820,7 +9821,7 @@ static void gent_bitnopaquefields(void)
                 if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                     if ((dset = H5Dcreate2(grp, "opaque_2", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                         for(i = 0; i < nelmts; i++)
-                            buf2[i] = (unsigned int)0xffff ^ (unsigned int)(i * 16);
+                            buf2[i] = (uint16_t)0xffff ^ (uint16_t)(i * 16);
 
                         H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2);
                         H5Dclose(dset);
@@ -9843,10 +9844,10 @@ static void gent_bitnopaquefields(void)
             if ((space = H5Screate_simple(1, &nelmts, NULL)) >= 0) {
                 if ((dset = H5Dcreate2(grp, "compound_1", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     for(i = 0; i < nelmts; i++) {
-                        buf5[i].a = (unsigned char)0xff ^ (unsigned char)i;
-                        buf5[i].b = (unsigned int)0xffff ^ (unsigned int)(i * 16);
-                        buf5[i].c = (unsigned long)0xffffffff ^ (unsigned long)(i * 32);
-                        buf5[i].d = (unsigned long long)0xffffffffffffffff ^ (unsigned long long)(i * 64);
+                        buf5[i].a = (uint8_t)0xff ^ (uint8_t)i;
+                        buf5[i].b = (uint16_t)0xffff ^ (uint16_t)(i * 16);
+                        buf5[i].c = (uint32_t)0xffffffff ^ (uint32_t)(i * 32);
+                        buf5[i].d = (uint64_t)0xffffffffffffffff ^ (uint64_t)(i * 64);
                     }
 
                     H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf5);
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index cf5f246..1136742 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -42,6 +42,8 @@ AWK='awk'
 # Skip plugin module to test missing filter
 ENVCMD="env HDF5_PLUGIN_PRELOAD=::"
 
+WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
+
 nerrors=0
 verbose=yes
 
@@ -97,6 +99,7 @@ $SRC_H5DUMP_TESTFILES/tattrintsize.h5
 $SRC_H5DUMP_TESTFILES/tattrreg.h5
 $SRC_H5DUMP_TESTFILES/tbigdims.h5
 $SRC_H5DUMP_TESTFILES/tbinary.h5
+$SRC_H5DUMP_TESTFILES/tbitnopaque.h5
 $SRC_H5DUMP_TESTFILES/tchar.h5
 $SRC_H5DUMP_TESTFILES/tcmpdattrintsize.h5
 $SRC_H5DUMP_TESTFILES/tcmpdintsize.h5
@@ -217,6 +220,8 @@ $SRC_H5DUMP_TESTFILES/tbin3.ddl
 $SRC_H5DUMP_TESTFILES/tbin4.ddl
 $SRC_H5DUMP_TESTFILES/tbinregR.ddl
 $SRC_H5DUMP_TESTFILES/tbigdims.ddl
+$SRC_H5DUMP_TESTFILES/tbitnopaque_be.ddl
+$SRC_H5DUMP_TESTFILES/tbitnopaque_le.ddl
 $SRC_H5DUMP_TESTFILES/tboot1.ddl
 $SRC_H5DUMP_TESTFILES/tboot2.ddl
 $SRC_H5DUMP_TESTFILES/tboot2A.ddl
@@ -487,6 +492,8 @@ TOOLTEST() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $xCMP $expect $actual > /dev/null 2>&1 ; then
      echo " PASSED"
     else
@@ -529,11 +536,15 @@ TOOLTEST2() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
       if [ ! -f $expectdata ]; then
       # Create the expect data file if it doesn't yet exist.
         echo " CREATED"
         cp $actualdata $expectdata
+        echo "    Expected data (*.exp) missing"
+        nerrors="`expr $nerrors + 1`"
       elif $CMP $expectdata $actualdata; then
         echo " PASSED"
       else
@@ -584,16 +595,22 @@ TOOLTEST2A() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
       if [ ! -f $expectdata ]; then
       # Create the expect data file if it doesn't yet exist.
         echo " CREATED"
         cp $actualdata $expectdata
+        echo "    Expected data (*.exp) missing"
+        nerrors="`expr $nerrors + 1`"
       elif $DIFF $expectdata $actualdata; then
         if [ ! -f $expectmeta ]; then
         # Create the expect meta file if it doesn't yet exist.
           echo " CREATED"
           cp $actualmeta $expectmeta
+          echo "    Expected metafile (*.ddl) missing"
+          nerrors="`expr $nerrors + 1`"
         elif $CMP $expectmeta $actualmeta; then
           echo " PASSED"
         else
@@ -645,6 +662,8 @@ TOOLTEST2B() {
     # Create the expect data file if it doesn't yet exist.
       echo " CREATED"
       cp $actualdata $expectdata
+      echo "    Expected data (*.exp) missing"
+      nerrors="`expr $nerrors + 1`"
     elif $CMP $expectdata $actualdata; then
       echo " PASSED"
     else
@@ -700,6 +719,8 @@ TOOLTEST3() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      echo " PASSED"
     else
@@ -757,15 +778,17 @@ TOOLTEST4() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      if $CMP $expect_err $actual_ext; then
       echo " PASSED"
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.err) differs from actual result (*.oerr)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-    fi
+     else
+      echo "*FAILED*"
+      echo "    Expected result (*.err) differs from actual result (*.oerr)"
+      nerrors="`expr $nerrors + 1`"
+      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+     fi
     else
      echo "*FAILED*"
      echo "    Expected result (*.ddl) differs from actual result (*.out)"
@@ -821,15 +844,17 @@ TOOLTEST5() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      if $CMP $expect_err $actual_ext; then
       echo " PASSED"
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.err) differs from actual result (*.oerr)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-    fi
+     else
+      echo "*FAILED*"
+      echo "    Expected result (*.err) differs from actual result (*.oerr)"
+      nerrors="`expr $nerrors + 1`"
+      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+     fi
     else
      echo "*FAILED*"
      echo "    Expected result (*.ddl) differs from actual result (*.out)"
@@ -863,6 +888,8 @@ TOOLTEST_HELP() {
     # Create the expect data file if it doesn't yet exist.
       echo " CREATED"
       cp $actual $expect-CREATED
+      echo "    Expected output (*.txt) missing"
+      nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
       echo " PASSED"
     else
@@ -1036,9 +1063,13 @@ TOOLTEST tcomp-2.ddl --enable-error-stack -N /type1 --any_path /type2 --any_path
 TOOLTEST4 tcomp-3.ddl --enable-error-stack -t /#6632 -g /group2 tcompound.h5
 # test complicated compound datatype
 TOOLTEST tcomp-4.ddl --enable-error-stack tcompound_complex.h5
-TOOLTEST tcompound_complex.ddl --enable-error-stack tcompound_complex2.h5
+TOOLTEST tcompound_complex2.ddl --enable-error-stack tcompound_complex2.h5
 # tests for bitfields and opaque data types
-TOOLTEST tbitnopaque.ddl --enable-error-stack tbitnopaque.h5
+if test $WORDS_BIGENDIAN != "yes"; then
+TOOLTEST tbitnopaque_le.ddl --enable-error-stack tbitnopaque.h5
+else
+TOOLTEST tbitnopaque_be.ddl --enable-error-stack tbitnopaque.h5
+fi
 
 #test for the nested compound type
 TOOLTEST tnestcomp-1.ddl --enable-error-stack tnestedcomp.h5
diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in
index 3b9b078..9cf5c99 100644
--- a/tools/test/h5dump/testh5dumppbits.sh.in
+++ b/tools/test/h5dump/testh5dumppbits.sh.in
@@ -241,6 +241,8 @@ TOOLTEST() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      echo " PASSED"
     else
@@ -282,11 +284,15 @@ TOOLTEST2() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
       if [ ! -f $expectdata ]; then
       # Create the expect data file if it doesn't yet exist.
         echo " CREATED"
         cp $actualdata $expectdata
+        echo "    Expected data (*.exp) missing"
+        nerrors="`expr $nerrors + 1`"
       elif $CMP $expectdata $actualdata; then
         echo " PASSED"
       else
@@ -348,6 +354,8 @@ TOOLTEST3() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      echo " PASSED"
     else
@@ -404,15 +412,17 @@ TOOLTEST4() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      if $CMP $expect_err $actual_ext; then
       echo " PASSED"
-    else
-     echo "*FAILED*"
-     echo "    Expected result (*.err) differs from actual result (*.oerr)"
-     nerrors="`expr $nerrors + 1`"
-     test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
-    fi
+     else
+      echo "*FAILED*"
+      echo "    Expected result (*.err) differs from actual result (*.oerr)"
+      nerrors="`expr $nerrors + 1`"
+      test yes = "$verbose" && $DIFF $expect_err $actual_ext |sed 's/^/    /'
+     fi
     else
      echo "*FAILED*"
      echo "    Expected result (*.ddl) differs from actual result (*.out)"
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index 63c0d85..f89234e 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -220,6 +220,8 @@ TOOLTEST() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      echo " PASSED"
     else
@@ -261,11 +263,15 @@ TOOLTEST2() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
       if [ ! -f $expectdata ]; then
       # Create the expect data file if it doesn't yet exist.
         echo " CREATED"
         cp $actualdata $expectdata
+        echo "    Expected data (*.exp) missing"
+        nerrors="`expr $nerrors + 1`"
       elif $CMP $expectdata $actualdata; then
         echo " PASSED"
       else
@@ -327,6 +333,8 @@ TOOLTEST3() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
      echo " PASSED"
     else
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index 5a69845..5f62946 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -30,6 +30,8 @@ DIRNAME='dirname'
 LS='ls'
 AWK='awk'
 
+WORDS_BIGENDIAN="@WORDS_BIGENDIAN@"
+
 nerrors=0
 verbose=yes
 
@@ -124,7 +126,8 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5.xml
 $SRC_H5DUMP_TESTFILES/tarray6.h5.xml
 $SRC_H5DUMP_TESTFILES/tarray7.h5.xml
 $SRC_H5DUMP_TESTFILES/tattr.h5.xml
-$SRC_H5DUMP_TESTFILES/tbitfields.h5.xml
+$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml
+$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml
 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml
 $SRC_H5DUMP_TESTFILES/tcompound.h5.xml
 $SRC_H5DUMP_TESTFILES/tcompound2.h5.xml
@@ -202,10 +205,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-                
+
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -263,7 +266,9 @@ TOOLTEST() {
    if [ ! -f $expect ]; then
     # Create the expect file if it doesn't yet exist.
     echo " CREATED"
-     cp $actual $expect      
+     cp $actual $expect
+     echo "    Expected result (*.xml) missing"
+     nerrors="`expr $nerrors + 1`"
    elif  $CMP $expect $actual; then
       echo " PASSED"
    else
@@ -279,7 +284,7 @@ TOOLTEST() {
    fi
 }
 
-# Print a "SKIP" message    
+# Print a "SKIP" message
 SKIP() {
          TESTING $DUMPER $@
           echo  " -SKIP-"
@@ -297,7 +302,11 @@ COPY_TESTFILES_TO_TESTDIR
 # test XML
 TOOLTEST tall.h5.xml --xml tall.h5
 TOOLTEST tattr.h5.xml --xml tattr.h5
-TOOLTEST tbitfields.h5.xml --xml tbitfields.h5
+if test $WORDS_BIGENDIAN != "yes"; then
+TOOLTEST tbitfields_le.h5.xml --xml tbitfields.h5
+else
+TOOLTEST tbitfields_be.h5.xml --xml tbitfields.h5
+fi
 TOOLTEST tcompound.h5.xml --xml tcompound.h5
 TOOLTEST tcompound2.h5.xml --xml tcompound2.h5
 TOOLTEST tdatareg.h5.xml --xml tdatareg.h5
@@ -345,7 +354,7 @@ TOOLTEST tsaf.h5.xml --xml tsaf.h5
 TOOLTEST tempty.h5.xml --xml tempty.h5
 TOOLTEST tnamed_dtype_attr.h5.xml --xml tnamed_dtype_attr.h5
 ##Test dataset and attribute of null space.  Commented out:
-## wait until the XML schema is updated for null space. 
+## wait until the XML schema is updated for null space.
 ##TOOLTEST tnullspace.h5.xml --xml tnulspace.h5
 
 # other options for xml
@@ -356,7 +365,7 @@ TOOLTEST tempty-nons.h5.xml --xml -X ":" tempty.h5
 TOOLTEST tempty-nons-2.h5.xml --xml --xml-ns=":" tempty.h5
 
 ## Some of these combinations are syntactically correct but
-##  the URLs are dummies 
+##  the URLs are dummies
 TOOLTEST tempty-ns.h5.xml --xml -X "thing:" tempty.h5
 TOOLTEST tempty-ns-2.h5.xml --xml --xml-ns="thing:" tempty.h5
 TOOLTEST tempty-nons-uri.h5.xml --xml --xml-ns=":" --xml-dtd="http://somewhere.net" tempty.h5
diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in
index d3d7a9a..3ae180b 100644
--- a/tools/test/h5jam/testh5jam.sh.in
+++ b/tools/test/h5jam/testh5jam.sh.in
@@ -107,10 +107,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-                
+
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -154,19 +154,19 @@ SKIP() {
  echo  " -SKIP-"
 }
 
-# 
+#
 #  COMPARE_FILES a.h5 b.h5
-#    Compare two files, skipping the first line.  This is used to 
+#    Compare two files, skipping the first line.  This is used to
 #    compare the output of the dumper, skipping the file name which
 #    is different.
 #    The result is stored in 'compval'.
 #
 cmpval=0;
 COMPARE_FILES() {
-	$AWK 'NR > 1' $1 > $1.cmp
-	$AWK 'NR > 1' $2 > $2.cmp
- 	$CMP $1.cmp $2.cmp 
- 	cmpval=$?
+    $AWK 'NR > 1' $1 > $1.cmp
+    $AWK 'NR > 1' $2 > $2.cmp
+    $CMP $1.cmp $2.cmp
+    cmpval=$?
         rm -f $1.cmp $2.cmp
 }
 
@@ -174,10 +174,10 @@ COMPARE_FILES() {
 #     Clean up named files.
 CLEANUP() {
    if test -z "$HDF5_NOCLEANUP"; then
-	for i in $*
-	do
-		rm -f $i
-	done
+    for i in $*
+    do
+        rm -f $i
+    done
    fi
 }
 
@@ -190,7 +190,7 @@ CLEANUP() {
 #    the "cat" command.
 #
 SETUP() {
-	cat < $1 > $2
+    cat < $1 > $2
 }
 
 #
@@ -233,7 +233,7 @@ CHECKFILE() {
 }
 
 #
-# CHECK_UB file.h5 user_block_file origfile.h5 
+# CHECK_UB file.h5 user_block_file origfile.h5
 #
 #   Check the user block in 'file.h5' is the same as
 #   'user_block' (allowing for padding).
@@ -243,73 +243,73 @@ CHECKFILE() {
 #   and the test file compared to:
 #      cat compare_ub user_block_file.
 #
-#   This test uses './getub' to extract the user block from 
+#   This test uses './getub' to extract the user block from
 #   'file.h5', which is compared to the file described above.
 #
 #   The result is set in variable 'result1'.
 #
 result1=0;
 CHECK_UB_1() {
-	hfile="$1"
-	ufile="$2"
-
-	# check for third argument (the original file)
-	origfile="";
-	if [ -n "$3" ];
-	then
-		origfile="$3"
-	fi
-
-	# find the length of the user block to check
-	s1=`cat $ufile | wc -c | sed -e 's/ //g'`
-	if [ "$s1" = "0" ];
-	then
-		echo "File "$ufile" is empty"
-		result1=1;
-	fi
-
-	# Get the size of the original user block, if any.
-	if [ -n "$origfile" ];
-	then
-		# 'tellub' calls H5Fget_user_block to get the size
-		#  of the user block
-		s2=`$JAM_BIN/tellub $origfile`
-		if [ "$s2" = "0" ];
-		then
-			size=$s1;
-			cmpfile=$ufile
-		else
-			cmpfile="tt2"
-			size=`expr $s2 + $s1`
-			$JAM_BIN/getub -c $s2 $origfile > $cmpfile
-			cat $ufile >> $cmpfile
-		fi
-	else
-		# assume no user block
-		s2="0"
-		size=$s1;
-		cmpfile=$ufile
-	fi
-
-	# Extract 'size' bytes from the front of 'hfile'
-	# Compare to 'cmpfile', result is set in result1
-	tfile="tt1"
-	$JAM_BIN/getub -c $size $hfile > $tfile
-	res=`cmp $cmpfile $tfile`
-	if [ "$?" != "0" ];
-	then
-		echo $res
-		result1=1;
-	else
-		result1=0;
-	fi
-
-	# clean up
-	rm -f  $tfile
-	if [ "$s2" != "0" ] ;
-	then
-		rm -f $cmpfile
-	fi
+    hfile="$1"
+    ufile="$2"
+
+    # check for third argument (the original file)
+    origfile="";
+    if [ -n "$3" ];
+    then
+        origfile="$3"
+    fi
+
+    # find the length of the user block to check
+    s1=`cat $ufile | wc -c | sed -e 's/ //g'`
+    if [ "$s1" = "0" ];
+    then
+        echo "File "$ufile" is empty"
+        result1=1;
+    fi
+
+    # Get the size of the original user block, if any.
+    if [ -n "$origfile" ];
+    then
+        # 'tellub' calls H5Fget_user_block to get the size
+        #  of the user block
+        s2=`$JAM_BIN/tellub $origfile`
+        if [ "$s2" = "0" ];
+        then
+            size=$s1;
+            cmpfile=$ufile
+        else
+            cmpfile="tt2"
+            size=`expr $s2 + $s1`
+            $JAM_BIN/getub -c $s2 $origfile > $cmpfile
+            cat $ufile >> $cmpfile
+        fi
+    else
+        # assume no user block
+        s2="0"
+        size=$s1;
+        cmpfile=$ufile
+    fi
+
+    # Extract 'size' bytes from the front of 'hfile'
+    # Compare to 'cmpfile', result is set in result1
+    tfile="tt1"
+    $JAM_BIN/getub -c $size $hfile > $tfile
+    res=`cmp $cmpfile $tfile`
+    if [ "$?" != "0" ];
+    then
+        echo $res
+        result1=1;
+    else
+        result1=0;
+    fi
+
+    # clean up
+    rm -f  $tfile
+    if [ "$s2" != "0" ] ;
+    then
+        rm -f $cmpfile
+    fi
 }
 
 
@@ -321,25 +321,25 @@ CHECK_UB_1() {
 result2=0;
 
 CHECK_NOUB() {
-	hfile="$1"
-
-	# call 'ubsize' to get the size of the user block
-	ubsize=`$JAM_BIN/tellub $hfile`
-
-	if [ "$?" != "0" ];
-	then
-		# error
-		result2=1;
-	else
-	if [ "$ubsize" = "0" ];
-	then
-		# pass
-		result2=0;
-	else
-		# fail
-		result2=1;
-	fi
-	fi
+    hfile="$1"
+
+    # call 'ubsize' to get the size of the user block
+    ubsize=`$JAM_BIN/tellub $hfile`
+
+    if [ "$?" != "0" ];
+    then
+        # error
+        result2=1;
+    else
+    if [ "$ubsize" = "0" ];
+    then
+        # pass
+        result2=0;
+    else
+        # fail
+        result2=1;
+    fi
+    fi
 }
 
 #  JAMTEST user_block file.h5 [--clobber] [ofile.h5]
@@ -351,119 +351,119 @@ CHECK_NOUB() {
 #      3. check the user block is correct in the output (Check_UB)
 #    If the user block is correct, print "PASSED", else "*FAILED*"
 JAMTEST() {
-	ufile="$1"
-	ifile="$2"
-	compare_test=""   # the file to test
-	compare_orig=""   # the comparison to test against
-	cleanup=""
-
-	# sort out the arguments for the test and the check
-	do_clobber="no"
-	if [ "$3" = "--clobber" ];
-	then
-		#  clobber overwrites any existing user block
-		do_clobber="yes"
-		clobber="--clobber"
-		compare_orig=""
-		if [ -z "$4" ];
-		then
-			# output goes to infile, compare ubfile to infile
-			ofile=""
-			compare_test="$ifile"
-		else
-			# output goes to $4,  compare ofile to ubfile
-			ofile="$4"
-			compare_test="$ofile"
-		fi
-	else
-		clobber=""
-		# add user block to existing ub, if any 
-		if [ -z "$3" ];
-		then
-			# output goes to infile, compare ubfile to infile
-			ofile=""
-			compare_test="$ifile"
-			cp $ifile xxofile.h5
-			compare_orig="xxofile.h5"
-			cleanup="$cleanup $compare_orig"
-		else
-			# output goes to $3,  compare ofile to ubfile
-			ofile="$3"
-			compare_test="$ofile"
-			compare_orig="$ifile"
-		fi
-	fi
-
-	# call 'jam' with the appropriate arguments
-	if [ -n "$ofile" ];
-	then
-		TESTING h5jam -u `basename $ufile` -i `basename $ifile` -o `basename $ofile` $clobber
-		$JAM_BIN/$JAM -u $ufile -i $ifile -o $ofile $clobber
-	else
-		TESTING jam -u `basename $ufile` -i `basename $ifile` $clobber
-		$JAM_BIN/$JAM -u $ufile -i $ifile $clobber
-	fi
-
-	#echo "CHECK_UB_1 $compare_test $ufile $compare_orig"
-	CHECK_UB_1 $compare_test $ufile $compare_orig
-
-	if [ "$result1" = "0" ] ;
-	then
-		echo " PASSED"
-	else
-		echo " *FAILED*"
-      		nerrors="`expr $nerrors + 1`"
-	fi
- 	CLEANUP $cleanup
+    ufile="$1"
+    ifile="$2"
+    compare_test=""   # the file to test
+    compare_orig=""   # the comparison to test against
+    cleanup=""
+
+    # sort out the arguments for the test and the check
+    do_clobber="no"
+    if [ "$3" = "--clobber" ];
+    then
+        #  clobber overwrites any existing user block
+        do_clobber="yes"
+        clobber="--clobber"
+        compare_orig=""
+        if [ -z "$4" ];
+        then
+            # output goes to infile, compare ubfile to infile
+            ofile=""
+            compare_test="$ifile"
+        else
+            # output goes to $4,  compare ofile to ubfile
+            ofile="$4"
+            compare_test="$ofile"
+        fi
+    else
+        clobber=""
+        # add user block to existing ub, if any
+        if [ -z "$3" ];
+        then
+            # output goes to infile, compare ubfile to infile
+            ofile=""
+            compare_test="$ifile"
+            cp $ifile xxofile.h5
+            compare_orig="xxofile.h5"
+            cleanup="$cleanup $compare_orig"
+        else
+            # output goes to $3,  compare ofile to ubfile
+            ofile="$3"
+            compare_test="$ofile"
+            compare_orig="$ifile"
+        fi
+    fi
+
+    # call 'jam' with the appropriate arguments
+    if [ -n "$ofile" ];
+    then
+        TESTING h5jam -u `basename $ufile` -i `basename $ifile` -o `basename $ofile` $clobber
+        $JAM_BIN/$JAM -u $ufile -i $ifile -o $ofile $clobber
+    else
+        TESTING jam -u `basename $ufile` -i `basename $ifile` $clobber
+        $JAM_BIN/$JAM -u $ufile -i $ifile $clobber
+    fi
+
+    #echo "CHECK_UB_1 $compare_test $ufile $compare_orig"
+    CHECK_UB_1 $compare_test $ufile $compare_orig
+
+    if [ "$result1" = "0" ] ;
+    then
+        echo " PASSED"
+    else
+        echo " *FAILED*"
+            nerrors="`expr $nerrors + 1`"
+    fi
+    CLEANUP $cleanup
 }
-	
+
 # UNJAMTEST  file.h5 [- | --delete] ofile
 #
 #  Test the 'unjam' tool
 #
 ###fix the working directory here and in jamtest
 UNJAMTEST () {
-	infile="$1"
-	ofile="$3"
-	if [ "$2" = "-" ];
-	then
-		uofile="uofile"
-		TESTING h5unjam -i `basename $infile` -o `basename $ofile` "> "`basename $uofile`
-		$JAM_BIN/$UNJAM -i $infile -o $ofile > $uofile
-	else
-	if [ "$2" = "--delete" ];
-	then
-		uofile="none"
-		TESTING h5unjam -i `basename $infile` -o `basename $ofile` --delete
-		$JAM_BIN/$UNJAM  -i $infile -o $ofile --delete 
-
-	else
-		uofile="$2"
-		TESTING h5unjam -i `basename $infile` -u `basename $uofile` -o `basename $ofile`
-		$JAM_BIN/$UNJAM  -i $infile -u $uofile -o $ofile
-	fi
-	fi
-
-	result1=0
-	result2=0
-	cleanup=""
-	if [ "$uofile" != "none" ];
-	then
-		# sets result1
-		CHECK_UB_1 $infile $uofile
-		CLEANUP $uofile
-	fi
-
-	# sets result2
-	CHECK_NOUB $ofile
-
-	if [ "$result1" = "0" -a "$result2" = "0" ];
-	then
-		echo " PASSED"
-	else
-		echo " *FAILED*"
-	      nerrors="`expr $nerrors + 1`"
-	fi
+    infile="$1"
+    ofile="$3"
+    if [ "$2" = "-" ];
+    then
+        uofile="uofile"
+        TESTING h5unjam -i `basename $infile` -o `basename $ofile` "> "`basename $uofile`
+        $JAM_BIN/$UNJAM -i $infile -o $ofile > $uofile
+    else
+    if [ "$2" = "--delete" ];
+    then
+        uofile="none"
+        TESTING h5unjam -i `basename $infile` -o `basename $ofile` --delete
+        $JAM_BIN/$UNJAM  -i $infile -o $ofile --delete
+
+    else
+        uofile="$2"
+        TESTING h5unjam -i `basename $infile` -u `basename $uofile` -o `basename $ofile`
+        $JAM_BIN/$UNJAM  -i $infile -u $uofile -o $ofile
+    fi
+    fi
+
+    result1=0
+    result2=0
+    cleanup=""
+    if [ "$uofile" != "none" ];
+    then
+        # sets result1
+        CHECK_UB_1 $infile $uofile
+        CLEANUP $uofile
+    fi
+
+    # sets result2
+    CHECK_NOUB $ofile
+
+    if [ "$result1" = "0" -a "$result2" = "0" ];
+    then
+        echo " PASSED"
+    else
+        echo " *FAILED*"
+        nerrors="`expr $nerrors + 1`"
+    fi
 }
 
 
@@ -500,28 +500,30 @@ TOOLTEST_OUTPUT() {
     STDOUT_FILTER $actual
     cp $actual_err $actual_err_sav
     STDERR_FILTER $actual_err
-    # combine stderr to stdout for output compare 
+    # combine stderr to stdout for output compare
     cat $actual_err >> $actual
 
     if [ ! -f $expect ]; then
-	    # Create the expect file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
-	    rm -f $actual $actual_sav $actual_err $actual_err_sav
+        echo "    Expected result (*.ls) missing"
+        nerrors="`expr $nerrors + 1`"
+        rm -f $actual $actual_sav $actual_err $actual_err_sav
     elif $CMP $expect $actual; then
         echo " PASSED"
-	    rm -f $actual $actual_sav $actual_err $actual_err_sav
+        rm -f $actual $actual_sav $actual_err $actual_err_sav
     else
         echo "*FAILED*"
-	    echo "    Expected result differs from actual result"
-	    nerrors="`expr $nerrors + 1`"
+        echo "    Expected result differs from actual result"
+        nerrors="`expr $nerrors + 1`"
         test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 }
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T S                                ###
+###              T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
 # prepare for test
@@ -550,19 +552,19 @@ CHECKFILE $TESTDIR/tall.h5 ta5.h5
 CLEANUP ta5.h5
 
 SETUP $TESTDIR/tall.h5 ta6.h5
-JAMTEST $TESTDIR/u10.txt ta6.h5 
+JAMTEST $TESTDIR/u10.txt ta6.h5
 CHECKFILE $TESTDIR/tall.h5 ta6.h5
 CLEANUP ta6.h5
 SETUP $TESTDIR/tall.h5 ta7.h5
-JAMTEST $TESTDIR/u511.txt ta7.h5 
+JAMTEST $TESTDIR/u511.txt ta7.h5
 CHECKFILE $TESTDIR/tall.h5 ta7.h5
 CLEANUP ta7.h5
 SETUP $TESTDIR/tall.h5 ta8.h5
-JAMTEST $TESTDIR/u512.txt ta8.h5 
+JAMTEST $TESTDIR/u512.txt ta8.h5
 CHECKFILE $TESTDIR/tall.h5 ta8.h5
 CLEANUP ta8.h5
 SETUP $TESTDIR/tall.h5 ta9.h5
-JAMTEST $TESTDIR/u513.txt ta9.h5 
+JAMTEST $TESTDIR/u513.txt ta9.h5
 CHECKFILE $TESTDIR/tall.h5 ta9.h5
 CLEANUP ta9.h5
 
@@ -592,29 +594,29 @@ JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub513.h5 tax9.h5
 CHECKFILE $TESTDIR/tall.h5 tax9.h5
 CLEANUP tax9.h5
 
-JAMTEST $TESTDIR/u10.txt $TESTDIR/twithub.h5 --clobber taz2.h5 
+JAMTEST $TESTDIR/u10.txt $TESTDIR/twithub.h5 --clobber taz2.h5
 CHECKFILE $TESTDIR/tall.h5 taz2.h5
 CLEANUP taz2.h5
 JAMTEST $TESTDIR/u511.txt $TESTDIR/twithub.h5 --clobber taz3.h5
 CHECKFILE $TESTDIR/tall.h5 taz3.h5
 CLEANUP taz3.h5
-JAMTEST $TESTDIR/u512.txt $TESTDIR/twithub.h5 --clobber taz4.h5 
+JAMTEST $TESTDIR/u512.txt $TESTDIR/twithub.h5 --clobber taz4.h5
 CHECKFILE $TESTDIR/tall.h5 taz4.h5
 CLEANUP taz4.h5
-JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub.h5 --clobber taz5.h5 
+JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub.h5 --clobber taz5.h5
 CHECKFILE $TESTDIR/tall.h5 taz5.h5
 CLEANUP taz5.h5
 
-JAMTEST $TESTDIR/u10.txt $TESTDIR/twithub513.h5 --clobber taz6.h5 
+JAMTEST $TESTDIR/u10.txt $TESTDIR/twithub513.h5 --clobber taz6.h5
 CHECKFILE $TESTDIR/tall.h5 taz6.h5
 CLEANUP taz6.h5
 JAMTEST $TESTDIR/u511.txt $TESTDIR/twithub513.h5 --clobber taz7.h5
 CHECKFILE $TESTDIR/tall.h5 taz7.h5
 CLEANUP taz7.h5
-JAMTEST $TESTDIR/u512.txt $TESTDIR/twithub513.h5 --clobber taz8.h5 
+JAMTEST $TESTDIR/u512.txt $TESTDIR/twithub513.h5 --clobber taz8.h5
 CHECKFILE $TESTDIR/tall.h5 taz8.h5
 CLEANUP taz8.h5
-JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub513.h5 --clobber taz9.h5 
+JAMTEST $TESTDIR/u513.txt $TESTDIR/twithub513.h5 --clobber taz9.h5
 CHECKFILE $TESTDIR/tall.h5 taz9.h5
 CLEANUP taz9.h5
 
@@ -653,7 +655,7 @@ CHECKFILE $TESTDIR/tall.h5 tay9.h5
 CLEANUP tay9.h5
 
 #---------------------------------
-# Testing h5unjam 
+# Testing h5unjam
 #---------------------------------
 # help page
 TOOLTEST_OUTPUT UNJAM h5unjam-help.txt 0 -h
diff --git a/tools/test/h5ls/Makefile.am b/tools/test/h5ls/Makefile.am
index 2494e18..8ace14d 100644
--- a/tools/test/h5ls/Makefile.am
+++ b/tools/test/h5ls/Makefile.am
@@ -47,6 +47,7 @@ libdynlibls.la: $(libdynlibls_la_OBJECTS) $(libdynlibls_la_DEPENDENCIES) $(EXTRA
 #	$(RM) $(DESTDIR)$(dyndir)/*dynlib*
 endif
 
+
 DISTCLEANFILES=h5ls_plugin.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 34114d8..c89269d 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -184,7 +184,7 @@ TOOLTEST() {
     # any unexpected output from that stream too.
     TESTING $H5LS $@
     (
-    cd $TESTDIR
+        cd $TESTDIR
         $ENVCMD $RUNSERIAL $H5LS_BIN "$@"
     ) >$actual 2>$actual_err
 
@@ -196,31 +196,33 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
     if [ $h5haveexitcode = 'yes' -a $exitcode -ne $retvalexpect ]; then
-    echo "*FAILED*"
-    nerrors="`expr $nerrors + 1`"
-    if [ yes = "$verbose" ]; then
-        echo "test returned with exit code $exitcode"
-        echo "test output: (up to $NLINES lines)"
-        head -$NLINES $actual
-        echo "***end of test output***"
-        echo ""
-    fi
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+        if [ yes = "$verbose" ]; then
+            echo "test returned with exit code $exitcode"
+            echo "test output: (up to $NLINES lines)"
+            head -$NLINES $actual
+            echo "***end of test output***"
+            echo ""
+        fi
     elif [ ! -f $expect ]; then
     # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ls) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     else
         echo "*FAILED*"
-    echo "    Expected result differs from actual result"
-    nerrors="`expr $nerrors + 1`"
-    test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "    Expected result differs from actual result"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-    rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 }
 
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index 31877d9..a88ae88 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -181,7 +181,7 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
 
@@ -239,7 +239,7 @@ TOOLTEST() {
     # any unexpected output from that stream too.
     TESTING $H5LS $@
     (
-	cd $TESTDIR
+        cd $TESTDIR
         $RUNSERIAL $H5LS_BIN "$@"
     ) >$actual 2>$actual_err
 
@@ -251,37 +251,39 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
     if [ $h5haveexitcode = 'yes' -a $exitcode -ne $retvalexpect ]; then
-	echo "*FAILED*"
-	nerrors="`expr $nerrors + 1`"
-	if [ yes = "$verbose" ]; then
-	    echo "test returned with exit code $exitcode"
-	    echo "test output: (up to $NLINES lines)"
-	    head -$NLINES $actual
-	    echo "***end of test output***"
-	    echo ""
-	fi
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+        if [ yes = "$verbose" ]; then
+            echo "test returned with exit code $exitcode"
+            echo "test output: (up to $NLINES lines)"
+            head -$NLINES $actual
+            echo "***end of test output***"
+            echo ""
+        fi
     elif [ ! -f $expect ]; then
-	# Create the expect file if it doesn't yet exist.
+    # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ls) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     else
         echo "*FAILED*"
-	echo "    Expected result differs from actual result"
-	nerrors="`expr $nerrors + 1`"
-	test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "    Expected result differs from actual result"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 }
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T S                                ###
+###              T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
 # prepare for test
diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in
index ddb1632..eb44367 100644
--- a/tools/test/h5ls/testh5lsvds.sh.in
+++ b/tools/test/h5ls/testh5lsvds.sh.in
@@ -187,7 +187,7 @@ TOOLTEST() {
     # any unexpected output from that stream too.
     TESTING $H5LS $@
     (
-  cd $TESTDIR
+        cd $TESTDIR
         $RUNSERIAL $H5LS_BIN "$@"
     ) >$actual 2>$actual_err
 
@@ -199,37 +199,39 @@ TOOLTEST() {
     STDERR_FILTER $actual_err
     cat $actual_err >> $actual
     if [ $h5haveexitcode = 'yes' -a $exitcode -ne $retvalexpect ]; then
-  echo "*FAILED*"
-  nerrors="`expr $nerrors + 1`"
-  if [ yes = "$verbose" ]; then
-      echo "test returned with exit code $exitcode"
-      echo "test output: (up to $NLINES lines)"
-      head -$NLINES $actual
-      echo "***end of test output***"
-      echo ""
-  fi
+        echo "*FAILED*"
+        nerrors="`expr $nerrors + 1`"
+        if [ yes = "$verbose" ]; then
+            echo "test returned with exit code $exitcode"
+            echo "test output: (up to $NLINES lines)"
+            head -$NLINES $actual
+            echo "***end of test output***"
+            echo ""
+        fi
     elif [ ! -f $expect ]; then
-  # Create the expect file if it doesn't yet exist.
+        # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ls) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     else
         echo "*FAILED*"
-  echo "    Expected result differs from actual result"
-  nerrors="`expr $nerrors + 1`"
-  test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
+        echo "    Expected result differs from actual result"
+        nerrors="`expr $nerrors + 1`"
+        test yes = "$verbose" && $DIFF $expect $actual |sed 's/^/    /'
     fi
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-  rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 }
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T S                                ###
+###              T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
 # prepare for test
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
index a15d6bb..da2a3c3 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -60,6 +60,7 @@ libdynlibvers.la: $(libdynlibvers_la_OBJECTS) $(libdynlibvers_la_DEPENDENCIES) $
 #	$(RM) $(DESTDIR)$(dyndir)/*dynlib*
 endif
 
+
 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
 CHECK_CLEANFILES+=*.h5 *.bin testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 032494b..bc6b527 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -179,7 +179,7 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
 
@@ -375,6 +375,8 @@ VERIFY_LAYOUT_VDS()
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.ddl) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual > /dev/null 2>&1 ; then
      echo " PASSED"
     else
@@ -386,7 +388,7 @@ VERIFY_LAYOUT_VDS()
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-	rm -f $actual $actual_err
+    rm -f $actual $actual_err
     fi
 
     # clean up tmp files
@@ -541,11 +543,11 @@ TOOLTEST1()
     )
     RET=$?
     if [ $RET != 0 ] ; then
-	echo "*FAILED*"
-	nerrors="`expr $nerrors + 1`"
+    echo "*FAILED*"
+    nerrors="`expr $nerrors + 1`"
     else
-	echo " PASSED"
-	DIFFTEST $infile $outfile
+    echo " PASSED"
+    DIFFTEST $infile $outfile
     fi
     rm -f $outfile
 }
@@ -572,11 +574,11 @@ TOOLTESTV()
     ) >$actual 2>$actual_err
     RET=$?
     if [ $RET != 0 ] ; then
-	echo "*FAILED*"
-	nerrors="`expr $nerrors + 1`"
+    echo "*FAILED*"
+    nerrors="`expr $nerrors + 1`"
     else
-	echo " PASSED"
-	DIFFTEST $infile $outfile
+    echo " PASSED"
+    DIFFTEST $infile $outfile
     fi
 
     # display output compare
@@ -637,6 +639,8 @@ TOOLTESTM() {
     # Create the expect file if it doesn't yet exist.
      echo " CREATED"
      cp $actual $expect
+     echo "    Expected result (*.tst) missing"
+     nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
       echo " PASSED"
     else
@@ -648,7 +652,7 @@ TOOLTESTM() {
 
     # Clean up output file
     if test -z "$HDF5_NOCLEANUP"; then
-   rm -f $actual $actual_err $actual_sav $actual_err_sav
+        rm -f $actual $actual_err $actual_sav $actual_err_sav
     fi
 
 }
@@ -762,11 +766,11 @@ TOOLTEST_META()
     # verify sizes.
     MESSAGE "Verify the sizes of both output files ($size1 vs $size2)"
     if [ $size1 -lt $size2 ]; then
-    	# pass
-	echo " PASSED"
+        # pass
+    echo " PASSED"
     else
-	#fail
-	echo "*FAILED*"
+    #fail
+    echo "*FAILED*"
         nerrors="`expr $nerrors + 1`"
     fi
 
@@ -793,6 +797,8 @@ TOOLTEST_HELP() {
     # Create the expect data file if it doesn't yet exist.
       echo " CREATED"
       cp $actual $expect-CREATED
+      echo "    Expected result (*.txt) missing"
+      nerrors="`expr $nerrors + 1`"
     elif cmp -s $expect $actual; then
       echo " PASSED"
     else
@@ -840,7 +846,7 @@ USE_FILTER_SZIP_ENCODER=`$RUNSERIAL $H5DETECTSZIP_BIN`
 fi
 
 ##############################################################################
-###			  T H E   T E S T S
+###              T H E   T E S T S
 ##############################################################################
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
@@ -1229,7 +1235,7 @@ TOOLTEST_META meta_long h5repack_layout.h5 --metadata_block_size=8192
 if test  $USE_FILTER_DEFLATE != "yes" ; then
     SKIP vds_dset_chunk_20x10x5
 else
-    VERIFY_LAYOUT_VDS vds_dset_chunk_20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5
+    VERIFY_LAYOUT_VDS vds_dset_chunk20x10x5 1_vds.h5 vds_dset CHUNKED --layout vds_dset:CHUNK=20x10x5
 fi
 
 if test  $USE_FILTER_DEFLATE != "yes" ; then
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index c4a52c3..ca7ca4c 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -14,8 +14,8 @@
 # Tests for the h5stat tool
 #
 # Modifcations:
-# 	Vailin Choi; July 2013
-# 	Add tests for -l, -m, -a options
+#     Vailin Choi; July 2013
+#     Add tests for -l, -m, -a options
 #
 
 srcdir=@srcdir@
@@ -132,10 +132,10 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-    	        $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-                
+
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -199,9 +199,11 @@ TOOLTEST() {
    cat $actual_err >> $actual
 
    if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-    echo " CREATED"
-    cp $actual $expect
+      # Create the expect file if it doesn't yet exist.
+      echo " CREATED"
+      cp $actual $expect
+      echo "    Expected result (*.ddl) missing"
+      nerrors="`expr $nerrors + 1`"
    elif $CMP $expect $actual; then
       echo " PASSED"
    else
@@ -220,15 +222,15 @@ TOOLTEST() {
 
 # Print a "SKIP" message
 SKIP() {
-	 TESTING $STAT $@
-	  echo  " -SKIP-"
+    TESTING $STAT $@
+    echo  " -SKIP-"
 }
-  
+
 
 
 ##############################################################################
 ##############################################################################
-###			  T H E   T E S T S                                ###
+###              T H E   T E S T S                                ###
 ##############################################################################
 ##############################################################################
 # prepare for test
@@ -252,7 +254,7 @@ TOOLTEST h5stat_filters-dT.ddl -dT  h5stat_filters.h5
 TOOLTEST h5stat_filters-UD.ddl -D h5stat_filters.h5
 TOOLTEST h5stat_filters-UT.ddl -T h5stat_filters.h5
 #
-# h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c 
+# h5stat_tsohm.h5 is a copy of ../../../test/tsohm.h5 generated by tsohm.c
 # as of release 1.8.7-snap0 (on a 64-bit machine)
 TOOLTEST h5stat_tsohm.ddl h5stat_tsohm.h5
 # h5stat_newgrat.h5 is generated by h5stat_gentest.c
@@ -262,36 +264,36 @@ TOOLTEST h5stat_newgrat-UA.ddl -A h5stat_newgrat.h5
 # h5stat_idx.h5 is generated by h5stat_gentest.c
 TOOLTEST h5stat_idx.ddl h5stat_idx.h5
 #
-# Tests for -l (--links) option on h5stat_threshold.h5: 
-# 	-l 0 (incorrect threshold value)
-# 	-g -l 8
-# 	--links=8
-# 	--links=20 -g
+# Tests for -l (--links) option on h5stat_threshold.h5:
+#     -l 0 (incorrect threshold value)
+#     -g -l 8
+#     --links=8
+#     --links=20 -g
 TOOLTEST h5stat_err1_links.ddl -l 0 h5stat_threshold.h5
 TOOLTEST h5stat_links1.ddl -g -l 8 h5stat_threshold.h5
 TOOLTEST h5stat_links2.ddl --links=8 h5stat_threshold.h5
 TOOLTEST h5stat_links3.ddl --links=20 -g h5stat_threshold.h5
 #
-# Tests for -l (--links) option on h5stat_newgrat.h5: 
-# 	-g
-# 	-g -l 40000
+# Tests for -l (--links) option on h5stat_newgrat.h5:
+#     -g
+#     -g -l 40000
 TOOLTEST h5stat_links4.ddl -g h5stat_newgrat.h5
 TOOLTEST h5stat_links5.ddl -g -l 40000 h5stat_newgrat.h5
 #
 # Tests for -m (--dims) option on h5stat_threshold.h5
-# 	-d --dims=-1 (incorrect threshold value)
-# 	-gd -m 5
-# 	-d --di=15
+#     -d --dims=-1 (incorrect threshold value)
+#     -gd -m 5
+#     -d --di=15
 TOOLTEST h5stat_err1_dims.ddl -d --dims=-1 h5stat_threshold.h5
 TOOLTEST h5stat_dims1.ddl -gd -m 5 h5stat_threshold.h5
 TOOLTEST h5stat_dims2.ddl -d --di=15 h5stat_threshold.h5
 #
 # Tests for -a option on h5stat_threshold.h5
-# 	-a -2 (incorrect threshold value)
-#	--numattrs (without threshold value)
-#	-AS -a 10
-#	-a 1
-#	-A --numattrs=25
+#     -a -2 (incorrect threshold value)
+#    --numattrs (without threshold value)
+#    -AS -a 10
+#    -a 1
+#    -A --numattrs=25
 TOOLTEST h5stat_err1_numattrs.ddl -a -2 h5stat_threshold.h5
 TOOLTEST h5stat_err2_numattrs.ddl --numattrs h5stat_threshold.h5
 TOOLTEST h5stat_numattrs1.ddl -AS -a 10 h5stat_threshold.h5
@@ -299,7 +301,7 @@ TOOLTEST h5stat_numattrs2.ddl -a 1 h5stat_threshold.h5
 TOOLTEST h5stat_numattrs3.ddl -A --numattrs=25 h5stat_threshold.h5
 #
 # Tests for -a option on h5stat_newgrat.h5
-#	-A -a 100
+#    -A -a 100
 TOOLTEST h5stat_numattrs4.ddl -A -a 100 h5stat_newgrat.h5
 #
 
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index 7ca1f92..9a72557 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -17,7 +17,7 @@
  */
 #include <string.h>
 #include <stdlib.h>
-/*#include <unistd.h>	*//* Required for unlink() */
+/*#include <unistd.h>    *//* Required for unlink() */
 
 #include "hdf5.h"
 #include "H5private.h"
@@ -86,8 +86,7 @@ int main(void)
     H5Tinsert(cmp, "Not Ok", sizeof(fok) + sizeof(string5), array_dt);
     H5Tclose(array_dt);
 
-    fix = h5tools_get_native_type(cmp);
-
+    fix = H5Tget_native_type(cmp, H5T_DIR_DEFAULT);
     cmp1 = H5Tcreate(H5T_COMPOUND, sizeof(fok));
 
     cdim[0] = sizeof(fok) / sizeof(float);
@@ -106,7 +105,7 @@ int main(void)
     H5Tclose(array_dt);
 
     plist = H5Pcreate(H5P_DATASET_XFER);
-    if((error = H5Pset_preserve(plist, 1)) < 0) 
+    if((error = H5Pset_preserve(plist, 1)) < 0)
         goto out;
 
     /*
@@ -208,35 +207,3 @@ out:
     return result;
 }
 
-/*-------------------------------------------------------------------------
- * Function: h5tools_get_native_type
- *
- * Purpose: Wrapper around H5Tget_native_type() to work around
- *  Problems with bitfields.
- *
- * Return: Success:    datatype ID
- *
- *  Failure:    FAIL
- *
- * Programmer: Quincey Koziol
- *              Tuesday, October  5, 2004
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-hid_t
-h5tools_get_native_type(hid_t type)
-{
-    hid_t p_type;
-    H5T_class_t type_class;
-
-    type_class = H5Tget_class(type);
-    if(type_class==H5T_BITFIELD)
-        p_type=H5Tcopy(type);
-    else
-        p_type = H5Tget_native_type(type,H5T_DIR_DEFAULT);
-
-    return(p_type);
-}
-
diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in
index 3990bd2..3ad1f71 100644
--- a/tools/test/misc/testh5mkgrp.sh.in
+++ b/tools/test/misc/testh5mkgrp.sh.in
@@ -98,7 +98,7 @@ COPY_TESTFILES_TO_TESTDIR()
                 $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
-                
+
                     # Comment out this to CREATE expected file
                     exit $EXIT_FAILURE
                 fi
@@ -122,7 +122,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
-TESTING() 
+TESTING()
 {
     SPACES="                                                               "
     echo "Testing $* $SPACES" |cut -c1-70 |tr -d '\012'
@@ -134,7 +134,7 @@ TESTING()
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Verifying".
 #
-VERIFY_H5LS() 
+VERIFY_H5LS()
 {
     SPACES="                                                               "
     echo "Verifying h5ls file structure $* $SPACES" | cut -c1-70 | tr -d '\012'
@@ -146,7 +146,7 @@ VERIFY_H5LS()
 # Assumed arguments:
 # $* arguments for h5mkgrp.
 
-TOOLTEST() 
+TOOLTEST()
 {
     TESTING $H5MKGRP $@
     (
@@ -171,7 +171,7 @@ TOOLTEST()
 
 # Call the h5ls tool to verify the correct output data in the destination file
 #
-H5LSTEST() 
+H5LSTEST()
 {
     expect="$TESTDIR/`basename $1 .h5`.ls"
     actual="$TESTDIR/`basename $1 .h5`.out"
@@ -191,9 +191,11 @@ H5LSTEST()
     STDERR_FILTER $actual
 
    if [ ! -f $expect ]; then
-    # Create the expect file if it doesn't yet exist.
-    echo " CREATED"
-    cp $actual $expect
+      # Create the expect file if it doesn't yet exist.
+      echo " CREATED"
+      cp $actual $expect
+      echo "    Expected result (*.ls) missing"
+      nerrors="`expr $nerrors + 1`"
    elif $CMP $expect $actual; then
       echo " PASSED"
    else
@@ -215,7 +217,7 @@ H5LSTEST()
 # $1 is test file name
 # $2 is h5mkgrp options
 # $* are groups to create
-RUNTEST() 
+RUNTEST()
 {
     FILEOUT=$1
     shift
@@ -244,7 +246,7 @@ RUNTEST()
 # $1 is test expected output file
 # $2 is h5mkgrp options
 # $* are groups to create
-CMPTEST() 
+CMPTEST()
 {
     FILEOUT=$1
     expect="$TESTDIR/`basename $1 .h5`.txt"
@@ -260,11 +262,13 @@ CMPTEST()
     $RUNSERIAL $H5MKGRP_BIN $@
     ) >$actual 2>$actual_err
     cat $actual_err >> $actual
-    
+
    if [ ! -f $expect ]; then
     # Create the expect file if it doesn't yet exist.
-    echo " CREATED"
-    cp $actual $expect
+      echo " CREATED"
+      cp $actual $expect
+      echo "    Expected result (*.txt) missing"
+      nerrors="`expr $nerrors + 1`"
    elif $CMP $expect $actual; then
       echo " PASSED"
    else
@@ -302,7 +306,7 @@ RUNTEST h5mkgrp_several_v.h5 "-v" one two
 RUNTEST h5mkgrp_several_p.h5 "-p" one two
 RUNTEST h5mkgrp_several_l.h5 "-l" one two
 
-# Create various nested groups 
+# Create various nested groups
 RUNTEST h5mkgrp_nested_p.h5 "-p" /one/two
 RUNTEST h5mkgrp_nested_lp.h5 "-lp" /one/two
 RUNTEST h5mkgrp_nested_mult_p.h5 "-p" /one/two /three/four
diff --git a/tools/testfiles/tbitfields_be.h5.xml b/tools/testfiles/tbitfields_be.h5.xml
new file mode 100644
index 0000000..26bbd91
--- /dev/null
+++ b/tools/testfiles/tbitfields_be.h5.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
+   <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="32" MaxDimSize="32"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="1"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            0xff
+            0xfe
+            0xfd
+            0xfc
+            0xfb
+            0xfa
+            0xf9
+            0xf8
+            0xf7
+            0xf6
+            0xf5
+            0xf4
+            0xf3
+            0xf2
+            0xf1
+            0xf0
+            0xef
+            0xee
+            0xed
+            0xec
+            0xeb
+            0xea
+            0xe9
+            0xe8
+            0xe7
+            0xe6
+            0xe5
+            0xe4
+            0xe3
+            0xe2
+            0xe1
+            0xe0
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352" H5Path= "/typetests/bitfield_2" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="16" MaxDimSize="16"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="2"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            fe:ff
+            fc:fd
+            fa:fb
+            f8:f9
+            f6:f7
+            f4:f5
+            f2:f3
+            f0:f1
+            ee:ef
+            ec:ed
+            ea:eb
+            e8:e9
+            e6:e7
+            e4:e5
+            e2:e3
+            e0:e1
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>
diff --git a/tools/testfiles/tbitfields_le.h5.xml b/tools/testfiles/tbitfields_le.h5.xml
new file mode 100644
index 0000000..c8ba026
--- /dev/null
+++ b/tools/testfiles/tbitfields_le.h5.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hdf5:HDF5-File xmlns:hdf5="http://hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdfgroup.org/HDF5/XML/schema/HDF5-File http://www.hdfgroup.org/HDF5/XML/schema/HDF5-File.xsd">
+<hdf5:RootGroup OBJ-XID="xid_696" H5Path="/">
+   <hdf5:Group Name="typetests" OBJ-XID="xid_1344" H5Path="/typetests" Parents="xid_696" H5ParentPaths="/" >
+      <hdf5:Dataset Name="bitfield_1" OBJ-XID="xid_1720" H5Path= "/typetests/bitfield_1" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="32" MaxDimSize="32"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="1"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            0xff
+            0xfe
+            0xfd
+            0xfc
+            0xfb
+            0xfa
+            0xf9
+            0xf8
+            0xf7
+            0xf6
+            0xf5
+            0xf4
+            0xf3
+            0xf2
+            0xf1
+            0xf0
+            0xef
+            0xee
+            0xed
+            0xec
+            0xeb
+            0xea
+            0xe9
+            0xe8
+            0xe7
+            0xe6
+            0xe5
+            0xe4
+            0xe3
+            0xe2
+            0xe1
+            0xe0
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+      <hdf5:Dataset Name="bitfield_2" OBJ-XID="xid_2352" H5Path= "/typetests/bitfield_2" Parents="xid_1344" H5ParentPaths="/typetests">
+         <hdf5:StorageLayout>
+            <hdf5:ContiguousLayout/>
+         </hdf5:StorageLayout>
+         <hdf5:FillValueInfo FillTime="FillIfSet" AllocationTime="Late">
+            <hdf5:FillValue>
+               <hdf5:NoFill/>
+            </hdf5:FillValue>
+         </hdf5:FillValueInfo>
+         <hdf5:Dataspace>
+            <hdf5:SimpleDataspace Ndims="1">
+               <hdf5:Dimension  DimSize="16" MaxDimSize="16"/>
+            </hdf5:SimpleDataspace>
+         </hdf5:Dataspace>
+         <hdf5:DataType>
+            <hdf5:AtomicType>
+               <hdf5:BitfieldType ByteOrder="LE" Size="2"/>
+            </hdf5:AtomicType>
+         </hdf5:DataType>
+         <hdf5:Data>
+            <hdf5:DataFromFile>
+            ff:fe
+            fd:fc
+            fb:fa
+            f9:f8
+            f7:f6
+            f5:f4
+            f3:f2
+            f1:f0
+            ef:ee
+            ed:ec
+            eb:ea
+            e9:e8
+            e7:e6
+            e5:e4
+            e3:e2
+            e1:e0
+            </hdf5:DataFromFile>
+         </hdf5:Data>
+      </hdf5:Dataset>
+   </hdf5:Group>
+</hdf5:RootGroup>
+</hdf5:HDF5-File>
diff --git a/tools/testfiles/tbitnopaque.h5 b/tools/testfiles/tbitnopaque.h5
index 2b1f23d..089a86d 100644
--- a/tools/testfiles/tbitnopaque.h5
+++ b/tools/testfiles/tbitnopaque.h5
diff --git a/tools/testfiles/tbitnopaque_be.ddl b/tools/testfiles/tbitnopaque_be.ddl
new file mode 100644
index 0000000..b0de7c4
--- /dev/null
+++ b/tools/testfiles/tbitnopaque_be.ddl
@@ -0,0 +1,293 @@
+HDF5 "tbitnopaque.h5" {
+GROUP "/" {
+   GROUP "bittypetests" {
+      DATASET "bitfield_1" {
+         DATATYPE  H5T_STD_B8LE
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, 0xf7, 0xf6,
+         (10): 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0, 0xef, 0xee, 0xed, 0xec,
+         (20): 0xeb, 0xea, 0xe9, 0xe8, 0xe7, 0xe6, 0xe5, 0xe4, 0xe3, 0xe2,
+         (30): 0xe1, 0xe0
+         }
+      }
+      DATASET "bitfield_2" {
+         DATATYPE  H5T_STD_B16LE
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): ff:ff, ff:ef, ff:df, ff:cf, ff:bf, ff:af, ff:9f, ff:8f, ff:7f,
+         (9): ff:6f, ff:5f, ff:4f, ff:3f, ff:2f, ff:1f, ff:0f, fe:ff, fe:ef,
+         (18): fe:df, fe:cf, fe:bf, fe:af, fe:9f, fe:8f, fe:7f, fe:6f, fe:5f,
+         (27): fe:4f, fe:3f, fe:2f, fe:1f, fe:0f
+         }
+      }
+      DATASET "bitfield_3" {
+         DATATYPE  H5T_STD_B32LE
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): ff:ff:ff:ff, ff:ff:ff:df, ff:ff:ff:bf, ff:ff:ff:9f,
+         (4): ff:ff:ff:7f, ff:ff:ff:5f, ff:ff:ff:3f, ff:ff:ff:1f,
+         (8): ff:ff:fe:ff, ff:ff:fe:df, ff:ff:fe:bf, ff:ff:fe:9f,
+         (12): ff:ff:fe:7f, ff:ff:fe:5f, ff:ff:fe:3f, ff:ff:fe:1f,
+         (16): ff:ff:fd:ff, ff:ff:fd:df, ff:ff:fd:bf, ff:ff:fd:9f,
+         (20): ff:ff:fd:7f, ff:ff:fd:5f, ff:ff:fd:3f, ff:ff:fd:1f,
+         (24): ff:ff:fc:ff, ff:ff:fc:df, ff:ff:fc:bf, ff:ff:fc:9f,
+         (28): ff:ff:fc:7f, ff:ff:fc:5f, ff:ff:fc:3f, ff:ff:fc:1f
+         }
+      }
+      DATASET "bitfield_4" {
+         DATATYPE  H5T_STD_B64LE
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): ff:ff:ff:ff:ff:ff:ff:ff, ff:ff:ff:ff:ff:ff:ff:bf,
+         (2): ff:ff:ff:ff:ff:ff:ff:7f, ff:ff:ff:ff:ff:ff:ff:3f,
+         (4): ff:ff:ff:ff:ff:ff:fe:ff, ff:ff:ff:ff:ff:ff:fe:bf,
+         (6): ff:ff:ff:ff:ff:ff:fe:7f, ff:ff:ff:ff:ff:ff:fe:3f,
+         (8): ff:ff:ff:ff:ff:ff:fd:ff, ff:ff:ff:ff:ff:ff:fd:bf,
+         (10): ff:ff:ff:ff:ff:ff:fd:7f, ff:ff:ff:ff:ff:ff:fd:3f,
+         (12): ff:ff:ff:ff:ff:ff:fc:ff, ff:ff:ff:ff:ff:ff:fc:bf,
+         (14): ff:ff:ff:ff:ff:ff:fc:7f, ff:ff:ff:ff:ff:ff:fc:3f,
+         (16): ff:ff:ff:ff:ff:ff:fb:ff, ff:ff:ff:ff:ff:ff:fb:bf,
+         (18): ff:ff:ff:ff:ff:ff:fb:7f, ff:ff:ff:ff:ff:ff:fb:3f,
+         (20): ff:ff:ff:ff:ff:ff:fa:ff, ff:ff:ff:ff:ff:ff:fa:bf,
+         (22): ff:ff:ff:ff:ff:ff:fa:7f, ff:ff:ff:ff:ff:ff:fa:3f,
+         (24): ff:ff:ff:ff:ff:ff:f9:ff, ff:ff:ff:ff:ff:ff:f9:bf,
+         (26): ff:ff:ff:ff:ff:ff:f9:7f, ff:ff:ff:ff:ff:ff:f9:3f,
+         (28): ff:ff:ff:ff:ff:ff:f8:ff, ff:ff:ff:ff:ff:ff:f8:bf,
+         (30): ff:ff:ff:ff:ff:ff:f8:7f, ff:ff:ff:ff:ff:ff:f8:3f
+         }
+      }
+   }
+   GROUP "cmpdtypetests" {
+      DATASET "compound_1" {
+         DATATYPE  H5T_COMPOUND {
+            H5T_STD_B8LE "a";
+            H5T_STD_B16LE "b";
+            H5T_STD_B32LE "c";
+            H5T_STD_B64LE "d";
+         }
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): {
+               0xff,
+               ff:ff,
+               ff:ff:ff:ff,
+               ff:ff:ff:ff:ff:ff:ff:ff
+            },
+         (1): {
+               0xfe,
+               ff:ef,
+               ff:ff:ff:df,
+               ff:ff:ff:ff:ff:ff:ff:bf
+            },
+         (2): {
+               0xfd,
+               ff:df,
+               ff:ff:ff:bf,
+               ff:ff:ff:ff:ff:ff:ff:7f
+            },
+         (3): {
+               0xfc,
+               ff:cf,
+               ff:ff:ff:9f,
+               ff:ff:ff:ff:ff:ff:ff:3f
+            },
+         (4): {
+               0xfb,
+               ff:bf,
+               ff:ff:ff:7f,
+               ff:ff:ff:ff:ff:ff:fe:ff
+            },
+         (5): {
+               0xfa,
+               ff:af,
+               ff:ff:ff:5f,
+               ff:ff:ff:ff:ff:ff:fe:bf
+            },
+         (6): {
+               0xf9,
+               ff:9f,
+               ff:ff:ff:3f,
+               ff:ff:ff:ff:ff:ff:fe:7f
+            },
+         (7): {
+               0xf8,
+               ff:8f,
+               ff:ff:ff:1f,
+               ff:ff:ff:ff:ff:ff:fe:3f
+            },
+         (8): {
+               0xf7,
+               ff:7f,
+               ff:ff:fe:ff,
+               ff:ff:ff:ff:ff:ff:fd:ff
+            },
+         (9): {
+               0xf6,
+               ff:6f,
+               ff:ff:fe:df,
+               ff:ff:ff:ff:ff:ff:fd:bf
+            },
+         (10): {
+               0xf5,
+               ff:5f,
+               ff:ff:fe:bf,
+               ff:ff:ff:ff:ff:ff:fd:7f
+            },
+         (11): {
+               0xf4,
+               ff:4f,
+               ff:ff:fe:9f,
+               ff:ff:ff:ff:ff:ff:fd:3f
+            },
+         (12): {
+               0xf3,
+               ff:3f,
+               ff:ff:fe:7f,
+               ff:ff:ff:ff:ff:ff:fc:ff
+            },
+         (13): {
+               0xf2,
+               ff:2f,
+               ff:ff:fe:5f,
+               ff:ff:ff:ff:ff:ff:fc:bf
+            },
+         (14): {
+               0xf1,
+               ff:1f,
+               ff:ff:fe:3f,
+               ff:ff:ff:ff:ff:ff:fc:7f
+            },
+         (15): {
+               0xf0,
+               ff:0f,
+               ff:ff:fe:1f,
+               ff:ff:ff:ff:ff:ff:fc:3f
+            },
+         (16): {
+               0xef,
+               fe:ff,
+               ff:ff:fd:ff,
+               ff:ff:ff:ff:ff:ff:fb:ff
+            },
+         (17): {
+               0xee,
+               fe:ef,
+               ff:ff:fd:df,
+               ff:ff:ff:ff:ff:ff:fb:bf
+            },
+         (18): {
+               0xed,
+               fe:df,
+               ff:ff:fd:bf,
+               ff:ff:ff:ff:ff:ff:fb:7f
+            },
+         (19): {
+               0xec,
+               fe:cf,
+               ff:ff:fd:9f,
+               ff:ff:ff:ff:ff:ff:fb:3f
+            },
+         (20): {
+               0xeb,
+               fe:bf,
+               ff:ff:fd:7f,
+               ff:ff:ff:ff:ff:ff:fa:ff
+            },
+         (21): {
+               0xea,
+               fe:af,
+               ff:ff:fd:5f,
+               ff:ff:ff:ff:ff:ff:fa:bf
+            },
+         (22): {
+               0xe9,
+               fe:9f,
+               ff:ff:fd:3f,
+               ff:ff:ff:ff:ff:ff:fa:7f
+            },
+         (23): {
+               0xe8,
+               fe:8f,
+               ff:ff:fd:1f,
+               ff:ff:ff:ff:ff:ff:fa:3f
+            },
+         (24): {
+               0xe7,
+               fe:7f,
+               ff:ff:fc:ff,
+               ff:ff:ff:ff:ff:ff:f9:ff
+            },
+         (25): {
+               0xe6,
+               fe:6f,
+               ff:ff:fc:df,
+               ff:ff:ff:ff:ff:ff:f9:bf
+            },
+         (26): {
+               0xe5,
+               fe:5f,
+               ff:ff:fc:bf,
+               ff:ff:ff:ff:ff:ff:f9:7f
+            },
+         (27): {
+               0xe4,
+               fe:4f,
+               ff:ff:fc:9f,
+               ff:ff:ff:ff:ff:ff:f9:3f
+            },
+         (28): {
+               0xe3,
+               fe:3f,
+               ff:ff:fc:7f,
+               ff:ff:ff:ff:ff:ff:f8:ff
+            },
+         (29): {
+               0xe2,
+               fe:2f,
+               ff:ff:fc:5f,
+               ff:ff:ff:ff:ff:ff:f8:bf
+            },
+         (30): {
+               0xe1,
+               fe:1f,
+               ff:ff:fc:3f,
+               ff:ff:ff:ff:ff:ff:f8:7f
+            },
+         (31): {
+               0xe0,
+               fe:0f,
+               ff:ff:fc:1f,
+               ff:ff:ff:ff:ff:ff:f8:3f
+            }
+         }
+      }
+   }
+   GROUP "opaquetypetests" {
+      DATASET "opaque_1" {
+         DATATYPE  H5T_OPAQUE {
+            OPAQUE_TAG "1-byte opaque type";
+         }
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): 0xff, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xf9, 0xf8, 0xf7, 0xf6,
+         (10): 0xf5, 0xf4, 0xf3, 0xf2, 0xf1, 0xf0, 0xef, 0xee, 0xed, 0xec,
+         (20): 0xeb, 0xea, 0xe9, 0xe8, 0xe7, 0xe6, 0xe5, 0xe4, 0xe3, 0xe2,
+         (30): 0xe1, 0xe0
+         }
+      }
+      DATASET "opaque_2" {
+         DATATYPE  H5T_OPAQUE {
+            OPAQUE_TAG "2-byte opaque type";
+         }
+         DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
+         DATA {
+         (0): ff:ff, ef:ff, df:ff, cf:ff, bf:ff, af:ff, 9f:ff, 8f:ff, 7f:ff,
+         (9): 6f:ff, 5f:ff, 4f:ff, 3f:ff, 2f:ff, 1f:ff, 0f:ff, ff:fe, ef:fe,
+         (18): df:fe, cf:fe, bf:fe, af:fe, 9f:fe, 8f:fe, 7f:fe, 6f:fe, 5f:fe,
+         (27): 4f:fe, 3f:fe, 2f:fe, 1f:fe, 0f:fe
+         }
+      }
+   }
+}
+}
diff --git a/tools/testfiles/tbitnopaque.ddl b/tools/testfiles/tbitnopaque_le.ddl
index 9000463..0c59c0b 100644
--- a/tools/testfiles/tbitnopaque.ddl
+++ b/tools/testfiles/tbitnopaque_le.ddl
@@ -15,24 +15,24 @@ GROUP "/" {
          DATATYPE  H5T_STD_B16LE
          DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
          DATA {
-         (0): ff:ff, 00:00, ef:ff, 00:00, df:ff, 00:00, cf:ff, 00:00, bf:ff,
-         (9): 00:00, af:ff, 00:00, 9f:ff, 00:00, 8f:ff, 00:00, 7f:ff, 00:00,
-         (18): 6f:ff, 00:00, 5f:ff, 00:00, 4f:ff, 00:00, 3f:ff, 00:00, 2f:ff,
-         (27): 00:00, 1f:ff, 00:00, 0f:ff, 00:00
+         (0): ff:ff, ef:ff, df:ff, cf:ff, bf:ff, af:ff, 9f:ff, 8f:ff, 7f:ff,
+         (9): 6f:ff, 5f:ff, 4f:ff, 3f:ff, 2f:ff, 1f:ff, 0f:ff, ff:fe, ef:fe,
+         (18): df:fe, cf:fe, bf:fe, af:fe, 9f:fe, 8f:fe, 7f:fe, 6f:fe, 5f:fe,
+         (27): 4f:fe, 3f:fe, 2f:fe, 1f:fe, 0f:fe
          }
       }
       DATASET "bitfield_3" {
          DATATYPE  H5T_STD_B32LE
          DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
          DATA {
-         (0): ff:ff:ff:ff, 00:00:00:00, df:ff:ff:ff, 00:00:00:00,
-         (4): bf:ff:ff:ff, 00:00:00:00, 9f:ff:ff:ff, 00:00:00:00,
-         (8): 7f:ff:ff:ff, 00:00:00:00, 5f:ff:ff:ff, 00:00:00:00,
-         (12): 3f:ff:ff:ff, 00:00:00:00, 1f:ff:ff:ff, 00:00:00:00,
-         (16): ff:fe:ff:ff, 00:00:00:00, df:fe:ff:ff, 00:00:00:00,
-         (20): bf:fe:ff:ff, 00:00:00:00, 9f:fe:ff:ff, 00:00:00:00,
-         (24): 7f:fe:ff:ff, 00:00:00:00, 5f:fe:ff:ff, 00:00:00:00,
-         (28): 3f:fe:ff:ff, 00:00:00:00, 1f:fe:ff:ff, 00:00:00:00
+         (0): ff:ff:ff:ff, df:ff:ff:ff, bf:ff:ff:ff, 9f:ff:ff:ff,
+         (4): 7f:ff:ff:ff, 5f:ff:ff:ff, 3f:ff:ff:ff, 1f:ff:ff:ff,
+         (8): ff:fe:ff:ff, df:fe:ff:ff, bf:fe:ff:ff, 9f:fe:ff:ff,
+         (12): 7f:fe:ff:ff, 5f:fe:ff:ff, 3f:fe:ff:ff, 1f:fe:ff:ff,
+         (16): ff:fd:ff:ff, df:fd:ff:ff, bf:fd:ff:ff, 9f:fd:ff:ff,
+         (20): 7f:fd:ff:ff, 5f:fd:ff:ff, 3f:fd:ff:ff, 1f:fd:ff:ff,
+         (24): ff:fc:ff:ff, df:fc:ff:ff, bf:fc:ff:ff, 9f:fc:ff:ff,
+         (28): 7f:fc:ff:ff, 5f:fc:ff:ff, 3f:fc:ff:ff, 1f:fc:ff:ff
          }
       }
       DATASET "bitfield_4" {
@@ -282,10 +282,10 @@ GROUP "/" {
          }
          DATASPACE  SIMPLE { ( 32 ) / ( 32 ) }
          DATA {
-         (0): ff:ff, 00:00, ef:ff, 00:00, df:ff, 00:00, cf:ff, 00:00, bf:ff,
-         (9): 00:00, af:ff, 00:00, 9f:ff, 00:00, 8f:ff, 00:00, 7f:ff, 00:00,
-         (18): 6f:ff, 00:00, 5f:ff, 00:00, 4f:ff, 00:00, 3f:ff, 00:00, 2f:ff,
-         (27): 00:00, 1f:ff, 00:00, 0f:ff, 00:00
+         (0): ff:ff, ef:ff, df:ff, cf:ff, bf:ff, af:ff, 9f:ff, 8f:ff, 7f:ff,
+         (9): 6f:ff, 5f:ff, 4f:ff, 3f:ff, 2f:ff, 1f:ff, 0f:ff, ff:fe, ef:fe,
+         (18): df:fe, cf:fe, bf:fe, af:fe, 9f:fe, 8f:fe, 7f:fe, 6f:fe, 5f:fe,
+         (27): 4f:fe, 3f:fe, 2f:fe, 1f:fe, 0f:fe
          }
       }
    }