Source formatted

1 files changed, 169 insertions, 212 deletions

diff --git a/src/H5Odbg.c b/src/H5Odbg.c
index 86db45c..87f0dd4 100644
--- a/src/H5Odbg.c
+++ b/src/H5Odbg.c
@@ -26,54 +26,47 @@
 /* Module Setup */
 /****************/
 
-#define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
+#define H5O_PACKAGE /*suppress error about including H5Opkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5MMprivate.h"	/* Memory management			*/
-#include "H5Opkg.h"             /* Object headers			*/
-#include "H5Ppublic.h"		/* Property Lists			*/
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5MMprivate.h" /* Memory management			*/
+#include "H5Opkg.h"      /* Object headers			*/
+#include "H5Ppublic.h"   /* Property Lists			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 #ifdef H5O_DEBUG
-
+
 /*-------------------------------------------------------------------------
  * Function:	H5O_assert
  *
@@ -91,25 +84,25 @@
 herr_t
 H5O_assert(const H5O_t *oh)
 {
-    H5O_mesg_t *curr_msg;               /* Pointer to current message to examine */
-    H5O_mesg_t *tmp_msg;                /* Pointer to temporary message to examine */
-    unsigned cont_msgs_found = 0;       /* # of continuation messages for object */
-    size_t meta_space;                  /* Size of header metadata */
-    size_t mesg_space;                  /* Size of message raw data */
-    size_t free_space;                  /* Size of free space in header */
-    size_t hdr_size;                    /* Size of header's chunks */
-    unsigned u, v;                      /* Local index variables */
+    H5O_mesg_t *curr_msg;            /* Pointer to current message to examine */
+    H5O_mesg_t *tmp_msg;             /* Pointer to temporary message to examine */
+    unsigned    cont_msgs_found = 0; /* # of continuation messages for object */
+    size_t      meta_space;          /* Size of header metadata */
+    size_t      mesg_space;          /* Size of message raw data */
+    size_t      free_space;          /* Size of free space in header */
+    size_t      hdr_size;            /* Size of header's chunks */
+    unsigned    u, v;                /* Local index variables */
 
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     /* Initialize the tracking variables */
-    hdr_size = 0;
+    hdr_size   = 0;
     meta_space = (size_t)H5O_SIZEOF_HDR(oh) + (size_t)(H5O_SIZEOF_CHKHDR_OH(oh) * (oh->nchunks - 1));
     mesg_space = 0;
     free_space = 0;
 
     /* Loop over all chunks in object header */
-    for(u = 0; u < oh->nchunks; u++) {
+    for (u = 0; u < oh->nchunks; u++) {
         /* Accumulate the size of the header on header */
         hdr_size += oh->chunk[u].size;
 
@@ -124,9 +117,10 @@ H5O_assert(const H5O_t *oh)
         HDassert(H5F_addr_defined(oh->chunk[u].addr));
 
         /* Version specific checks */
-        if(oh->version > H5O_VERSION_1) {
+        if (oh->version > H5O_VERSION_1) {
             /* Make certain that the magic number is correct for each chunk */
-            HDassert(!HDmemcmp(oh->chunk[u].image, (u == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC));
+            HDassert(
+                !HDmemcmp(oh->chunk[u].image, (u == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC));
 
             /* Check for valid gap size */
             HDassert(oh->chunk[u].gap < (size_t)H5O_SIZEOF_MSGHDR_OH(oh));
@@ -137,33 +131,33 @@ H5O_assert(const H5O_t *oh)
     } /* end for */
 
     /* Check for correct chunk #0 size flags */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         uint64_t chunk0_size = oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh);
 
-        if(chunk0_size <= 255)
+        if (chunk0_size <= 255)
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_1);
-        else if(chunk0_size <= 65535)
+        else if (chunk0_size <= 65535)
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_2);
-        else if(chunk0_size <= 4294967295)
+        else if (chunk0_size <= 4294967295)
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_4);
         else
             HDassert((oh->flags & H5O_HDR_CHUNK0_SIZE) == H5O_HDR_CHUNK0_8);
     } /* end if */
 
     /* Loop over all messages in object header */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
         uint8_t *curr_hdr;      /* Start of current message header */
-        size_t  curr_tot_size;  /* Total size of current message (including header) */
+        size_t   curr_tot_size; /* Total size of current message (including header) */
 
-        curr_hdr = curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
+        curr_hdr      = curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh);
         curr_tot_size = curr_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
 
         /* Accumulate information, based on the type of message */
-	if(H5O_NULL_ID == curr_msg->type->id)
+        if (H5O_NULL_ID == curr_msg->type->id)
             free_space += curr_tot_size;
-        else if(H5O_CONT_ID == curr_msg->type->id) {
-            H5O_cont_t *cont = (H5O_cont_t *)curr_msg->native;
-            hbool_t found_chunk = FALSE;        /* Found a chunk that matches */
+        else if (H5O_CONT_ID == curr_msg->type->id) {
+            H5O_cont_t *cont        = (H5O_cont_t *)curr_msg->native;
+            hbool_t     found_chunk = FALSE; /* Found a chunk that matches */
 
             HDassert(cont);
 
@@ -172,13 +166,13 @@ H5O_assert(const H5O_t *oh)
 
             /* Sanity check that every continuation message has a matching chunk */
             /* (and only one) */
-            for(v = 0; v < oh->nchunks; v++) {
-                if(H5F_addr_eq(cont->addr, oh->chunk[v].addr) && cont->size == oh->chunk[v].size) {
+            for (v = 0; v < oh->nchunks; v++) {
+                if (H5F_addr_eq(cont->addr, oh->chunk[v].addr) && cont->size == oh->chunk[v].size) {
                     HDassert(cont->chunkno == v);
                     HDassert(!found_chunk);
                     found_chunk = TRUE;
                 } /* end if */
-            } /* end for */
+            }     /* end for */
             HDassert(found_chunk);
 
             meta_space += curr_tot_size;
@@ -195,25 +189,29 @@ H5O_assert(const H5O_t *oh)
         HDassert(curr_msg->chunkno < oh->nchunks);
 
         /* Make certain null messages aren't in chunks with gaps */
-        if(H5O_NULL_ID == curr_msg->type->id)
+        if (H5O_NULL_ID == curr_msg->type->id)
             HDassert(oh->chunk[curr_msg->chunkno].gap == 0);
 
         /* Make certain that the message is completely in a chunk message area */
-        HDassert(curr_tot_size <= (oh->chunk[curr_msg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
-        if(curr_msg->chunkno == 0)
-            HDassert(curr_hdr >= oh->chunk[curr_msg->chunkno].image + (H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
+        HDassert(curr_tot_size <= (oh->chunk[curr_msg->chunkno].size) -
+                                      (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
+        if (curr_msg->chunkno == 0)
+            HDassert(curr_hdr >=
+                     oh->chunk[curr_msg->chunkno].image + (H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
         else
-            HDassert(curr_hdr >= oh->chunk[curr_msg->chunkno].image + (H5O_SIZEOF_CHKHDR_OH(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
-        HDassert(curr_msg->raw + curr_msg->raw_size <= (oh->chunk[curr_msg->chunkno].image + oh->chunk[curr_msg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
+            HDassert(curr_hdr >= oh->chunk[curr_msg->chunkno].image +
+                                     (H5O_SIZEOF_CHKHDR_OH(oh) - H5O_SIZEOF_CHKSUM_OH(oh)));
+        HDassert(curr_msg->raw + curr_msg->raw_size <=
+                 (oh->chunk[curr_msg->chunkno].image + oh->chunk[curr_msg->chunkno].size) -
+                     (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[curr_msg->chunkno].gap));
 
         /* Make certain that no other messages overlap this message */
-        for(v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
-            if(u != v)
-                HDassert(!((tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) >= curr_hdr
-                        && (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh))
-                        < (curr_hdr + curr_tot_size)));
+        for (v = 0, tmp_msg = &oh->mesg[0]; v < oh->nmesgs; v++, tmp_msg++) {
+            if (u != v)
+                HDassert(!((tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) >= curr_hdr &&
+                           (tmp_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh)) < (curr_hdr + curr_tot_size)));
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
     /* Sanity check that the # of cont. messages is correct for the # of chunks */
     HDassert(oh->nchunks == (cont_msgs_found + 1));
@@ -225,7 +223,6 @@ H5O_assert(const H5O_t *oh)
 } /* end H5O_assert() */
 #endif /* H5O_DEBUG */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_debug_id
  *
@@ -243,16 +240,17 @@ H5O_assert(const H5O_t *oh)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent, int fwidth)
+H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream, int indent,
+             int fwidth)
 {
-    const H5O_msg_class_t *type;            /* Actual H5O class type for the ID */
-    herr_t      ret_value;       /* Return value */
+    const H5O_msg_class_t *type;      /* Actual H5O class type for the ID */
+    herr_t                 ret_value; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Check args */
     HDassert(type_id < NELMTS(H5O_msg_class_g));
-    type = H5O_msg_class_g[type_id];    /* map the type ID to the actual type object */
+    type = H5O_msg_class_g[type_id]; /* map the type ID to the actual type object */
     HDassert(type);
     HDassert(type->debug);
     HDassert(f);
@@ -262,14 +260,13 @@ H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *
     HDassert(fwidth >= 0);
 
     /* Call the debug method in the class */
-    if((ret_value = (type->debug)(f, dxpl_id, mesg, stream, indent, fwidth)) < 0)
+    if ((ret_value = (type->debug)(f, dxpl_id, mesg, stream, indent, fwidth)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "unable to debug message")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_debug_id() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_debug_real
  *
@@ -290,10 +287,10 @@ done:
 herr_t
 H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    size_t	mesg_total = 0, chunk_total = 0, gap_total = 0;
-    unsigned	*sequence = NULL;
-    unsigned	i;              /* Local index variable */
-    herr_t	ret_value = SUCCEED;
+    size_t    mesg_total = 0, chunk_total = 0, gap_total = 0;
+    unsigned *sequence = NULL;
+    unsigned  i; /* Local index variable */
+    herr_t    ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -308,93 +305,71 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i
     /* debug */
     HDfprintf(stream, "%*sObject Header...\n", indent, "");
 
-    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth,
-	      "Dirty:",
-	      oh->cache_info.is_dirty);
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Version:",
-	      oh->version);
+    HDfprintf(stream, "%*s%-*s %t\n", indent, "", fwidth, "Dirty:", oh->cache_info.is_dirty);
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Version:", oh->version);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Header size (in bytes):",
-	      (unsigned)H5O_SIZEOF_HDR(oh));
-    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-	      "Number of links:",
-	      oh->nlink);
+              "Header size (in bytes):", (unsigned)H5O_SIZEOF_HDR(oh));
+    HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth, "Number of links:", oh->nlink);
 
     /* Extra information for later versions */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Display object's status flags */
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Attribute creation order tracked:",
-		   (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? "Yes" : "No");
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Attribute creation order indexed:",
-		   (oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? "Yes" : "No");
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Attribute storage phase change values:",
-		   (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? "Non-default" : "Default");
-	HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-		   "Timestamps:",
-		   (oh->flags & H5O_HDR_STORE_TIMES) ? "Enabled" : "Disabled");
-        if(oh->flags & ~H5O_HDR_ALL_FLAGS)
-            HDfprintf(stream, "*** UNKNOWN OBJECT HEADER STATUS FLAG: %02x!\n",
-                (unsigned)oh->flags);
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order tracked:",
+                  (oh->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) ? "Yes" : "No");
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute creation order indexed:",
+                  (oh->flags & H5O_HDR_ATTR_CRT_ORDER_INDEXED) ? "Yes" : "No");
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Attribute storage phase change values:",
+                  (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) ? "Non-default" : "Default");
+        HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
+                  "Timestamps:", (oh->flags & H5O_HDR_STORE_TIMES) ? "Enabled" : "Disabled");
+        if (oh->flags & ~H5O_HDR_ALL_FLAGS)
+            HDfprintf(stream, "*** UNKNOWN OBJECT HEADER STATUS FLAG: %02x!\n", (unsigned)oh->flags);
 
         /* Only dump times, if they are tracked */
-        if(oh->flags & H5O_HDR_STORE_TIMES) {
-            struct tm *tm;          /* Time structure */
-            char buf[128];          /* Buffer for formatting time info */
+        if (oh->flags & H5O_HDR_STORE_TIMES) {
+            struct tm *tm;       /* Time structure */
+            char       buf[128]; /* Buffer for formatting time info */
 
             /* Time fields */
             tm = HDlocaltime(&oh->atime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Access Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Access Time:", buf);
             tm = HDlocaltime(&oh->mtime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Modification Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Modification Time:", buf);
             tm = HDlocaltime(&oh->ctime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Change Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Change Time:", buf);
             tm = HDlocaltime(&oh->btime);
             HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
-            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-                    "Birth Time:", buf);
+            HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth, "Birth Time:", buf);
         } /* end if */
 
         /* Attribute tracking fields */
-        if(oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
+        if (oh->flags & H5O_HDR_ATTR_STORE_PHASE_CHANGE) {
             HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                      "Max. compact attributes:",
-                      (unsigned)oh->max_compact);
+                      "Max. compact attributes:", (unsigned)oh->max_compact);
             HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
-                      "Min. dense attributes:",
-                      (unsigned)oh->min_dense);
+                      "Min. dense attributes:", (unsigned)oh->min_dense);
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     HDfprintf(stream, "%*s%-*s %Zu (%Zu)\n", indent, "", fwidth,
-	      "Number of messages (allocated):",
-	      oh->nmesgs, oh->alloc_nmesgs);
-    HDfprintf(stream, "%*s%-*s %Zu (%Zu)\n", indent, "", fwidth,
-	      "Number of chunks (allocated):",
-	      oh->nchunks, oh->alloc_nchunks);
+              "Number of messages (allocated):", oh->nmesgs, oh->alloc_nmesgs);
+    HDfprintf(stream, "%*s%-*s %Zu (%Zu)\n", indent, "", fwidth, "Number of chunks (allocated):", oh->nchunks,
+              oh->alloc_nchunks);
 
     /* debug each chunk */
-    for(i = 0, chunk_total = 0; i < oh->nchunks; i++) {
+    for (i = 0, chunk_total = 0; i < oh->nchunks; i++) {
         size_t chunk_size;
 
-	HDfprintf(stream, "%*sChunk %d...\n", indent, "", i);
+        HDfprintf(stream, "%*sChunk %d...\n", indent, "", i);
 
-	HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Address:",
-                  oh->chunk[i].addr);
+        HDfprintf(stream, "%*s%-*s %a\n", indent + 3, "", MAX(0, fwidth - 3), "Address:", oh->chunk[i].addr);
 
         /* Decrement chunk 0's size by the object header prefix size */
-	if(0 == i) {
-            if(H5F_addr_ne(oh->chunk[i].addr, addr))
+        if (0 == i) {
+            if (H5F_addr_ne(oh->chunk[i].addr, addr))
                 HDfprintf(stream, "*** WRONG ADDRESS FOR CHUNK #0!\n");
             chunk_size = oh->chunk[i].size - (size_t)H5O_SIZEOF_HDR(oh);
         } /* end if */
@@ -402,134 +377,117 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i
             chunk_size = oh->chunk[i].size;
 
         /* Accumulate chunk's size to total */
-	chunk_total += chunk_size;
-	gap_total += oh->chunk[i].gap;
+        chunk_total += chunk_size;
+        gap_total += oh->chunk[i].gap;
 
-	HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Size in bytes:",
-		  chunk_size);
+        HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3), "Size in bytes:", chunk_size);
 
-	HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Gap:",
-                  oh->chunk[i].gap);
+        HDfprintf(stream, "%*s%-*s %Zu\n", indent + 3, "", MAX(0, fwidth - 3), "Gap:", oh->chunk[i].gap);
     } /* end for */
 
     /* debug each message */
-    if(NULL == (sequence = (unsigned *)H5MM_calloc(NELMTS(H5O_msg_class_g) * sizeof(unsigned))))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-    for(i = 0, mesg_total = 0; i < oh->nmesgs; i++) {
-        const H5O_msg_class_t  *debug_type;              /* Type of message to use for callbacks */
-        unsigned chunkno;                       /* Chunk for message */
+    if (NULL == (sequence = (unsigned *)H5MM_calloc(NELMTS(H5O_msg_class_g) * sizeof(unsigned))))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+    for (i = 0, mesg_total = 0; i < oh->nmesgs; i++) {
+        const H5O_msg_class_t *debug_type; /* Type of message to use for callbacks */
+        unsigned               chunkno;    /* Chunk for message */
 
         /* Accumulate message's size to total */
-	mesg_total += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[i].raw_size;
-
-	/* For version 2 object header, add size of "OCHK" for continuation chunk */
-	if (oh->mesg[i].type->id == H5O_CONT_ID)
-	    mesg_total += H5O_SIZEOF_CHKHDR_OH(oh);
-
-	HDfprintf(stream, "%*sMessage %d...\n", indent, "", i);
-
-	/* check for bad message id */
-	if(oh->mesg[i].type->id >= (int)NELMTS(H5O_msg_class_g)) {
-	    HDfprintf(stream, "*** BAD MESSAGE ID 0x%04x\n",
-		      oh->mesg[i].type->id);
-	    continue;
-	} /* end if */
-
-	/* message name and size */
-	HDfprintf(stream, "%*s%-*s 0x%04x `%s' (%d)\n",
-		  indent + 3, "", MAX(0, fwidth - 3),
-		  "Message ID (sequence number):",
-		  (unsigned) (oh->mesg[i].type->id),
-		  oh->mesg[i].type->name,
-		  sequence[oh->mesg[i].type->id]++);
-	HDfprintf(stream, "%*s%-*s %t\n", indent + 3, "", MAX (0, fwidth - 3),
-		   "Dirty:",
-		   oh->mesg[i].dirty);
-        HDfprintf(stream, "%*s%-*s ", indent + 3, "", MAX (0, fwidth - 3),
-                   "Message flags:");
-	if(oh->mesg[i].flags) {
+        mesg_total += (size_t)H5O_SIZEOF_MSGHDR_OH(oh) + oh->mesg[i].raw_size;
+
+        /* For version 2 object header, add size of "OCHK" for continuation chunk */
+        if (oh->mesg[i].type->id == H5O_CONT_ID)
+            mesg_total += H5O_SIZEOF_CHKHDR_OH(oh);
+
+        HDfprintf(stream, "%*sMessage %d...\n", indent, "", i);
+
+        /* check for bad message id */
+        if (oh->mesg[i].type->id >= (int)NELMTS(H5O_msg_class_g)) {
+            HDfprintf(stream, "*** BAD MESSAGE ID 0x%04x\n", oh->mesg[i].type->id);
+            continue;
+        } /* end if */
+
+        /* message name and size */
+        HDfprintf(stream, "%*s%-*s 0x%04x `%s' (%d)\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Message ID (sequence number):", (unsigned)(oh->mesg[i].type->id), oh->mesg[i].type->name,
+                  sequence[oh->mesg[i].type->id]++);
+        HDfprintf(stream, "%*s%-*s %t\n", indent + 3, "", MAX(0, fwidth - 3), "Dirty:", oh->mesg[i].dirty);
+        HDfprintf(stream, "%*s%-*s ", indent + 3, "", MAX(0, fwidth - 3), "Message flags:");
+        if (oh->mesg[i].flags) {
             hbool_t flag_printed = FALSE;
 
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_SHARED) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_SHARED) {
                 HDfprintf(stream, "<S");
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_CONSTANT) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_CONSTANT) {
                 HDfprintf(stream, "%sC", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_DONTSHARE) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_DONTSHARE) {
                 HDfprintf(stream, "%sDS", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_FAIL_IF_UNKNOWN_AND_OPEN_FOR_WRITE) {
                 HDfprintf(stream, "%sFIU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN) {
                 HDfprintf(stream, "%sMIU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(oh->mesg[i].flags & H5O_MSG_FLAG_WAS_UNKNOWN) {
+            if (oh->mesg[i].flags & H5O_MSG_FLAG_WAS_UNKNOWN) {
                 HDassert(oh->mesg[i].flags & H5O_MSG_FLAG_MARK_IF_UNKNOWN);
                 HDfprintf(stream, "%sWU", (flag_printed ? ", " : "<"));
                 flag_printed = TRUE;
             } /* end if */
-            if(!flag_printed)
+            if (!flag_printed)
                 HDfprintf(stream, "-");
             HDfprintf(stream, ">\n");
-            if(oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS)
-                HDfprintf(stream, "%*s%-*s 0x%02x\n", indent + 3,"", MAX(0, fwidth - 3),
-                           "*** ADDITIONAL UNKNOWN FLAGS --->",
-                           oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS);
+            if (oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS)
+                HDfprintf(stream, "%*s%-*s 0x%02x\n", indent + 3, "", MAX(0, fwidth - 3),
+                          "*** ADDITIONAL UNKNOWN FLAGS --->", oh->mesg[i].flags & ~H5O_MSG_FLAG_BITS);
         } /* end if */
         else
             HDfprintf(stream, "<none>\n");
-	HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Chunk number:",
-		  oh->mesg[i].chunkno);
-	chunkno = oh->mesg[i].chunkno;
-	if(chunkno >= oh->nchunks)
-	    HDfprintf(stream, "*** BAD CHUNK NUMBER\n");
-	HDfprintf(stream, "%*s%-*s (%Zu, %Zu) bytes\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Raw message data (offset, size) in chunk:",
-		  (size_t)(oh->mesg[i].raw - oh->chunk[chunkno].image),
-		  oh->mesg[i].raw_size);
-
-	/* check the size */
-	if((oh->mesg[i].raw + oh->mesg[i].raw_size >
-                 oh->chunk[chunkno].image + oh->chunk[chunkno].size) ||
-                (oh->mesg[i].raw < oh->chunk[chunkno].image))
-	    HDfprintf(stream, "*** BAD MESSAGE RAW ADDRESS\n");
-
-	/* decode the message */
-	debug_type = oh->mesg[i].type;
-	if(NULL == oh->mesg[i].native && debug_type->decode)
+        HDfprintf(stream, "%*s%-*s %u\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Chunk number:", oh->mesg[i].chunkno);
+        chunkno = oh->mesg[i].chunkno;
+        if (chunkno >= oh->nchunks)
+            HDfprintf(stream, "*** BAD CHUNK NUMBER\n");
+        HDfprintf(stream, "%*s%-*s (%Zu, %Zu) bytes\n", indent + 3, "", MAX(0, fwidth - 3),
+                  "Raw message data (offset, size) in chunk:",
+                  (size_t)(oh->mesg[i].raw - oh->chunk[chunkno].image), oh->mesg[i].raw_size);
+
+        /* check the size */
+        if ((oh->mesg[i].raw + oh->mesg[i].raw_size > oh->chunk[chunkno].image + oh->chunk[chunkno].size) ||
+            (oh->mesg[i].raw < oh->chunk[chunkno].image))
+            HDfprintf(stream, "*** BAD MESSAGE RAW ADDRESS\n");
+
+        /* decode the message */
+        debug_type = oh->mesg[i].type;
+        if (NULL == oh->mesg[i].native && debug_type->decode)
             H5O_LOAD_NATIVE(f, dxpl_id, H5O_DECODEIO_NOCHANGE, oh, &oh->mesg[i], FAIL)
 
-	/* print the message */
-	HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3),
-		  "Message Information:");
-	if(debug_type->debug && oh->mesg[i].native != NULL)
-	    (debug_type->debug)(f, dxpl_id, oh->mesg[i].native, stream, indent + 6, MAX(0, fwidth - 6));
-	else
-	    HDfprintf(stream, "%*s<No info for this message>\n", indent + 6, "");
+        /* print the message */
+        HDfprintf(stream, "%*s%-*s\n", indent + 3, "", MAX(0, fwidth - 3), "Message Information:");
+        if (debug_type->debug && oh->mesg[i].native != NULL)
+            (debug_type->debug)(f, dxpl_id, oh->mesg[i].native, stream, indent + 6, MAX(0, fwidth - 6));
+        else
+            HDfprintf(stream, "%*s<No info for this message>\n", indent + 6, "");
     } /* end for */
 
-    if((mesg_total + gap_total) != chunk_total)
-	HDfprintf(stream, "*** TOTAL SIZE DOES NOT MATCH ALLOCATED SIZE!\n");
+    if ((mesg_total + gap_total) != chunk_total)
+        HDfprintf(stream, "*** TOTAL SIZE DOES NOT MATCH ALLOCATED SIZE!\n");
 
 done:
     /* Release resources */
-    if(sequence)
+    if (sequence)
         sequence = (unsigned *)H5MM_xfree(sequence);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_debug_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5O_debug
  *
@@ -546,9 +504,9 @@ done:
 herr_t
 H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    H5O_t	*oh = NULL;             /* Object header to display */
-    H5O_loc_t   loc;                    /* Object location for object to delete */
-    herr_t	ret_value = SUCCEED;    /* Return value */
+    H5O_t *   oh = NULL;           /* Object header to display */
+    H5O_loc_t loc;                 /* Object location for object to delete */
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -560,20 +518,19 @@ H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
     HDassert(fwidth >= 0);
 
     /* Set up the object location */
-    loc.file = f;
-    loc.addr = addr;
+    loc.file         = f;
+    loc.addr         = addr;
     loc.holding_file = FALSE;
 
-    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_READ)))
-	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
+    if (NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_READ)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* debug */
     H5O_debug_real(f, dxpl_id, oh, addr, stream, indent, fwidth);
 
 done:
-    if(oh && H5O_unprotect(&loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(&loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_debug() */
-