HDFFV-10282 refactor out assert calls in tools

3 files changed, 436 insertions, 413 deletions

diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index bf2e127..b90d60f 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -721,93 +721,100 @@ parse_mask_list(const char *h_list)
     const char        *ptr = NULL;
 
     /* sanity check */
-    HDassert(h_list);
+    if(h_list) {
+        HDmemset(packed_mask,0,sizeof(packed_mask));
+
+        packed_bits_num = 0;
+        /* scan in pair of offset,length separated by commas. */
+        ptr = h_list;
+        while (*ptr) {
+            /* scan for an offset which is an unsigned int */
+            if (!HDisdigit(*ptr)) {
+                error_msg("Bad mask list(%s)\n", h_list);
+                return FAIL;
+            }
+            soffset_value = HDatoi(ptr);
+            offset_value = (unsigned)soffset_value;
+            if (soffset_value < 0 || offset_value >= PACKED_BITS_SIZE_MAX) {
+                error_msg("Packed Bit offset value(%d) must be between 0 and %u\n",
+                        soffset_value, (unsigned)(PACKED_BITS_SIZE_MAX - 1));
+                return FAIL;
+            }
 
-    HDmemset(packed_mask,0,sizeof(packed_mask));
+            /* skip to end of integer */
+            while (HDisdigit(*++ptr))
+                ;
+            /* Look for the common separator */
+            if (*ptr++ != ',') {
+                error_msg("Bad mask list(%s), missing expected comma separator.\n", h_list);
+                return FAIL;
+            }
 
-    packed_bits_num = 0;
-    /* scan in pair of offset,length separated by commas. */
-    ptr = h_list;
-    while (*ptr) {
-        /* scan for an offset which is an unsigned int */
-        if (!HDisdigit(*ptr)) {
-            error_msg("Bad mask list(%s)\n", h_list);
-            return FAIL;
-        }
-        soffset_value = HDatoi(ptr);
-        offset_value = (unsigned)soffset_value;
-        if (soffset_value < 0 || offset_value >= PACKED_BITS_SIZE_MAX) {
-            error_msg("Packed Bit offset value(%d) must be between 0 and %u\n",
-                    soffset_value, (unsigned)(PACKED_BITS_SIZE_MAX - 1));
-            return FAIL;
-        }
+            /* scan for a length which is a positive int */
+            if (!HDisdigit(*ptr)) {
+                error_msg("Bad mask list(%s)\n", h_list);
+                return FAIL;
+            }
+            slength_value = HDatoi(ptr);
+            if (slength_value <= 0) {
+                error_msg("Packed Bit length value(%d) must be positive.\n", slength_value);
+                return FAIL;
+            }
+            length_value = (unsigned)slength_value;
+            if ((offset_value + length_value) > PACKED_BITS_SIZE_MAX) {
+                error_msg("Packed Bit offset+length value(%u) too large. Max is %u\n",
+                        offset_value+length_value, (unsigned)PACKED_BITS_SIZE_MAX);
+                return FAIL;
+            }
 
-        /* skip to end of integer */
-        while (HDisdigit(*++ptr))
-            ;
-        /* Look for the common separator */
-        if (*ptr++ != ',') {
-            error_msg("Bad mask list(%s), missing expected comma separator.\n", h_list);
-            return FAIL;
-        }
+            /* skip to end of int */
+            while (HDisdigit(*++ptr))
+                ;
 
-        /* scan for a length which is a positive int */
-        if (!HDisdigit(*ptr)) {
-            error_msg("Bad mask list(%s)\n", h_list);
-            return FAIL;
-        }
-        slength_value = HDatoi(ptr);
-        if (slength_value <= 0) {
-            error_msg("Packed Bit length value(%d) must be positive.\n", slength_value);
-            return FAIL;
+            /* store the offset,length pair */
+            if (packed_bits_num >= PACKED_BITS_MAX) {
+                /* too many requests */
+                error_msg("Too many masks requested (max. %d). Mask list(%s)\n", PACKED_BITS_MAX, h_list);
+                return FAIL;
+            }
+            packed_offset[packed_bits_num] = offset_value;
+            packed_length[packed_bits_num] = length_value;
+            /* create the bit mask by left shift 1's by length, then negate it. */
+            /* After packed_mask is calculated, packed_length is not needed but  */
+            /* keep it for debug purpose. */
+            temp_mask = ~0ULL;
+            if(length_value < (int)(8 *sizeof(unsigned long long))) {
+                temp_mask = temp_mask << length_value;
+                packed_mask[packed_bits_num] = ~temp_mask;
+            }
+            else
+                packed_mask[packed_bits_num] = temp_mask;
+            packed_bits_num++;
+
+            /* skip a possible comma separator */
+            if (*ptr == ',') {
+                if (!(*++ptr)) {
+                    /* unexpected end of string */
+                    error_msg("Bad mask list(%s), unexpected end of string.\n", h_list);
+                    return FAIL;
+                }
+            }
         }
-        length_value = (unsigned)slength_value;
-        if ((offset_value + length_value) > PACKED_BITS_SIZE_MAX) {
-            error_msg("Packed Bit offset+length value(%u) too large. Max is %u\n",
-                       offset_value+length_value, (unsigned)PACKED_BITS_SIZE_MAX);
+        if(packed_bits_num > PACKED_BITS_MAX) {
+            error_msg("Maximum number of packed bits exceeded\n");
             return FAIL;
         }
-
-        /* skip to end of int */
-        while (HDisdigit(*++ptr))
-            ;
-
-        /* store the offset,length pair */
-        if (packed_bits_num >= PACKED_BITS_MAX) {
-            /* too many requests */
-            error_msg("Too many masks requested (max. %d). Mask list(%s)\n", PACKED_BITS_MAX, h_list);
+        if (packed_bits_num == 0) {
+            /* got no masks! */
+            error_msg("Bad mask list(%s)\n", h_list);
             return FAIL;
         }
-        packed_offset[packed_bits_num] = offset_value;
-        packed_length[packed_bits_num] = length_value;
-        /* create the bit mask by left shift 1's by length, then negate it. */
-        /* After packed_mask is calculated, packed_length is not needed but  */
-        /* keep it for debug purpose. */
-        temp_mask = ~0ULL;
-        if(length_value < (int)(8 *sizeof(unsigned long long))) {
-            temp_mask = temp_mask << length_value;
-            packed_mask[packed_bits_num] = ~temp_mask;
-        }
-        else
-            packed_mask[packed_bits_num] = temp_mask;
-        packed_bits_num++;
-
-        /* skip a possible comma separator */
-        if (*ptr == ',') {
-            if (!(*++ptr)) {
-                /* unexpected end of string */
-                error_msg("Bad mask list(%s), unexpected end of string.\n", h_list);
-                return FAIL;
-            }
-        }
+        return SUCCEED;
     }
-    HDassert(packed_bits_num <= PACKED_BITS_MAX);
-    if (packed_bits_num == 0) {
-        /* got no masks! */
-        error_msg("Bad mask list(%s)\n", h_list);
+    else  {
+        error_msg("Bad mask list argument\n");
         return FAIL;
     }
-    return SUCCEED;
 }
 
 
@@ -1708,13 +1715,18 @@ h5_fileaccess(void)
         HDmemset(memb_name, 0, sizeof memb_name);
         HDmemset(memb_addr, 0, sizeof memb_addr);
 
-        HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES);
-        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
-            memb_fapl[mt] = H5P_DEFAULT;
-            memb_map[mt] = mt;
-            sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
-            memb_name[mt] = sv[mt];
-            memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
+        if(HDstrlen(multi_letters)==H5FD_MEM_NTYPES) {
+            for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) {
+                memb_fapl[mt] = H5P_DEFAULT;
+                memb_map[mt] = mt;
+                sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
+                memb_name[mt] = sv[mt];
+                memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
+            }
+        }
+        else {
+            error_msg("Bad multi_letters list\n");
+            return FAIL;
         }
 
         if (H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0)
@@ -1767,8 +1779,10 @@ h5_fileaccess(void)
 static void
 init_prefix(char **prfx, size_t prfx_len)
 {
-    HDassert(prfx_len > 0);
-    *prfx = (char *)HDcalloc(prfx_len, 1);
+    if(prfx_len > 0)
+        *prfx = (char *)HDcalloc(prfx_len, 1);
+    else
+        error_msg("unable to allocate prefix buffer\n");
 }
 
 
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 0a45840..eecd113 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -248,17 +248,19 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
 
                 /* Keep copy of prefix before iterating into group */
                 old_prefix = HDstrdup(prefix);
-                HDassert(old_prefix);
+                if (old_prefix) {
+                    /* Append group name to prefix */
+                    add_prefix(&prefix, &prefix_len, name);
 
-                /* Append group name to prefix */
-                add_prefix(&prefix, &prefix_len, name);
+                    /* Iterate into group */
+                    dump_function_table->dump_group_function(obj, name);
 
-                /* Iterate into group */
-                dump_function_table->dump_group_function(obj, name);
-
-                /* Restore old prefix name */
-                HDstrcpy(prefix, old_prefix);
-                HDfree(old_prefix);
+                    /* Restore old prefix name */
+                    HDstrcpy(prefix, old_prefix);
+                    HDfree(old_prefix);
+                }
+                else
+                    error_msg("warning: null prefix\n");
 
                 /* Close group */
                 H5Gclose(obj);
@@ -408,131 +410,137 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
 
         switch(linfo->type) {
         case H5L_TYPE_SOFT:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
-
-            ctx.need_prefix = TRUE;
-
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "%s \"%s\" %s",
-                    h5tools_dump_header_format->softlinkbegin, name,
-                    h5tools_dump_header_format->softlinkblockbegin);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-
-            ctx.indent_level++;
-
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                error_msg("unable to get link value\n");
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL) {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
             }
             else {
-                /* print the value of a soft link */
-                /* Standard DDL: no modification */
                 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, "LINKTARGET \"%s\"", targbuf);
+                h5tools_str_append(&buffer, "%s \"%s\" %s",
+                        h5tools_dump_header_format->softlinkbegin, name,
+                        h5tools_dump_header_format->softlinkblockbegin);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-            }
 
-            ctx.indent_level--;
+                ctx.indent_level++;
 
-            ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                    error_msg("unable to get link value\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    ret = FAIL;
+                }
+                else {
+                    /* print the value of a soft link */
+                    /* Standard DDL: no modification */
+                    ctx.need_prefix = TRUE;
+                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            if(HDstrlen(h5tools_dump_header_format->softlinkblockend)) {
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkblockend);
-                if(HDstrlen(h5tools_dump_header_format->softlinkend))
-                    h5tools_str_append(&buffer, " ");
-            }
-            if(HDstrlen(h5tools_dump_header_format->softlinkend))
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkend);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                    /* Render the element */
+                    h5tools_str_reset(&buffer);
+                    h5tools_str_append(&buffer, "LINKTARGET \"%s\"", targbuf);
+                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                }
 
-            HDfree(targbuf);
-            break;
+                ctx.indent_level--;
 
-        case H5L_TYPE_EXTERNAL:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-            ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                if(HDstrlen(h5tools_dump_header_format->softlinkblockend)) {
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkblockend);
+                    if(HDstrlen(h5tools_dump_header_format->softlinkend))
+                        h5tools_str_append(&buffer, " ");
+                }
+                if(HDstrlen(h5tools_dump_header_format->softlinkend))
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkend);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            h5tools_str_append(&buffer, "%s \"%s\" %s",
-                    h5tools_dump_header_format->extlinkbegin, name,
-                    h5tools_dump_header_format->extlinkblockbegin);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                HDfree(targbuf);
+            }
+            break;
 
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                indentation(dump_indent);
-                error_msg("unable to get external link value\n");
+        case H5L_TYPE_EXTERNAL:
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL) {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            } /* end if */
+            }
             else {
-                const char *filename;
-                const char *targname;
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                h5tools_str_append(&buffer, "%s \"%s\" %s",
+                        h5tools_dump_header_format->extlinkbegin, name,
+                        h5tools_dump_header_format->extlinkblockbegin);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
                     indentation(dump_indent);
-                    error_msg("unable to unpack external link value\n");
+                    error_msg("unable to get external link value\n");
                     h5tools_setstatus(EXIT_FAILURE);
                     ret = FAIL;
                 } /* end if */
                 else {
-                    ctx.indent_level++;
+                    const char *filename;
+                    const char *targname;
 
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                    if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
+                        indentation(dump_indent);
+                        error_msg("unable to unpack external link value\n");
+                        h5tools_setstatus(EXIT_FAILURE);
+                        ret = FAIL;
+                    } /* end if */
+                    else {
+                        ctx.indent_level++;
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "TARGETFILE \"%s\"", filename);
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    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, "TARGETFILE \"%s\"", filename);
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "TARGETPATH \"%s\"", targname);
-                    h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    /* dump the external link */
-                    dump_extlink(group, name, targname);
-                    ctx.indent_level--;
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "TARGETPATH \"%s\"", targname);
+                        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+
+                        /* dump the external link */
+                        dump_extlink(group, name, targname);
+                        ctx.indent_level--;
+                    } /* end else */
                 } /* end else */
-            } /* end else */
-            ctx.need_prefix = TRUE;
-            h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                ctx.need_prefix = TRUE;
+                h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-            /* Render the element */
-            h5tools_str_reset(&buffer);
-            if(HDstrlen(h5tools_dump_header_format->extlinkblockend)) {
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkblockend);
+                /* Render the element */
+                h5tools_str_reset(&buffer);
+                if(HDstrlen(h5tools_dump_header_format->extlinkblockend)) {
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkblockend);
+                    if(HDstrlen(h5tools_dump_header_format->extlinkend))
+                        h5tools_str_append(&buffer, " ");
+                }
                 if(HDstrlen(h5tools_dump_header_format->extlinkend))
-                    h5tools_str_append(&buffer, " ");
-            }
-            if(HDstrlen(h5tools_dump_header_format->extlinkend))
-                h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkend);
-            h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+                    h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkend);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-            HDfree(targbuf);
+                HDfree(targbuf);
+            }
             break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
-            HDassert(0);
-            /* fall through */
         case H5L_TYPE_HARD:
         default:
             ctx.need_prefix = TRUE;
@@ -1082,7 +1090,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
             default:
-                HDassert(0);
+                error_msg("invalid H5TCLASS type\n");
                 break;
             } /* end switch */
         } /* for(u=0; u<data_loop; u++) */
@@ -1183,10 +1191,10 @@ dump_fcpl(hid_t fid)
     size_t   off_size;  /* size of offsets in the file */
     size_t   len_size;  /* size of lengths in the file */
     H5F_fspace_strategy_t  fs_strategy;  /* file space strategy */
-    hbool_t fs_persist; 	/* Persisting free-space or not */
-    hsize_t fs_threshold;   	/* free-space section threshold */
-    hsize_t fsp_size;    	/* file space page size */
-    H5F_info2_t finfo;  	/* file information */
+    hbool_t fs_persist;     /* Persisting free-space or not */
+    hsize_t fs_threshold;       /* free-space section threshold */
+    hsize_t fsp_size;        /* file space page size */
+    H5F_info2_t finfo;      /* file information */
 #ifdef SHOW_FILE_DRIVER
     hid_t    fapl;      /* file access property list ID */
     hid_t    fdriver;   /* file driver */
@@ -1980,8 +1988,6 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
-            HDassert(0);
-            /* fall through */
         case H5L_TYPE_HARD:
         default:
             begin_obj(h5tools_dump_header_format->udlinkbegin, links, h5tools_dump_header_format->udlinkblockbegin);
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index d731013..a83ec08 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -198,18 +198,22 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
                 char *old_prefix; /* Pointer to previous prefix */
 
                 /* Keep copy of prefix before iterating into group */
-                old_prefix = HDstrdup(prefix);
-                HDassert(old_prefix);
-
-                /* Append group name to prefix */
-                add_prefix(&prefix, &prefix_len, name);
+                if((old_prefix = HDstrdup(prefix)) == NULL)  {
+                    error_msg("unable to allocate buffer\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    ret = FAIL;
+                }
+                else {
+                    /* Append group name to prefix */
+                    add_prefix(&prefix, &prefix_len, name);
 
-                /* Iterate into group */
-                dump_function_table->dump_group_function(obj, name);
+                    /* Iterate into group */
+                    dump_function_table->dump_group_function(obj, name);
 
-                /* Restore old prefix name */
-                HDstrcpy(prefix, old_prefix);
-                HDfree(old_prefix);
+                    /* Restore old prefix name */
+                    HDstrcpy(prefix, old_prefix);
+                    HDfree(old_prefix);
+                }
 
                 /* Close group */
                 H5Gclose(obj);
@@ -360,161 +364,167 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_
 
         switch(linfo->type) {
         case H5L_TYPE_SOFT:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
-
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                error_msg("unable to get link value\n");
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL)  {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
             }
             else {
-                /* print the value of a soft link */
-                /* XML */
-                char linkxid[100];
-                char parentxid[100];
-                char targetxid[100];
-                char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
-                char *t_name = xml_escape_the_name(name);
-                char *t_targbuf = xml_escape_the_name(targbuf);
-                char *t_obj_path = xml_escape_the_name(obj_path);
-                char *t_link_path;
-                int res;
-
-                t_link_path = (char *)HDmalloc(HDstrlen(prefix) + linfo->u.val_size + 1);
-                if(targbuf[0] == '/')
-                    HDstrcpy(t_link_path, targbuf);
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                    error_msg("unable to get link value\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    ret = FAIL;
+                }
                 else {
-                    HDstrcpy(t_link_path, prefix);
-                    HDstrcat(HDstrcat(t_link_path, "/"), targbuf);
-                } /* end else */
+                    /* print the value of a soft link */
+                    /* XML */
+                    char linkxid[100];
+                    char parentxid[100];
+                    char targetxid[100];
+                    char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
+                    char *t_name = xml_escape_the_name(name);
+                    char *t_targbuf = xml_escape_the_name(targbuf);
+                    char *t_obj_path = xml_escape_the_name(obj_path);
+                    char *t_link_path;
+                    int res;
 
-                /* Create OBJ-XIDs for the parent and object */
-                xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
-                xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
+                    t_link_path = (char *)HDmalloc(HDstrlen(prefix) + linfo->u.val_size + 1);
+                    if(targbuf[0] == '/')
+                        HDstrcpy(t_link_path, targbuf);
+                    else {
+                        HDstrcpy(t_link_path, prefix);
+                        HDstrcat(HDstrcat(t_link_path, "/"), targbuf);
+                    } /* end else */
 
-                /* Try to create an OBJ-XID for the object pointed to */
-                res = xml_name_to_XID(t_link_path, targetxid, (int)sizeof(targetxid), 0);
-                if (res == 0) {
-                    /* target obj found */
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                    /* Create OBJ-XIDs for the parent and object */
+                    xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
+                    xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
-                            "OBJ-XID=\"%s\" "
-                            "H5SourcePath=\"%s\" "
-                            "TargetPath=\"%s\" TargetObj=\"%s\" "
-                            "Parents=\"%s\" H5ParentPaths=\"%s\" />",
-                            xmlnsprefix,
-                            t_name,         /* LinkName */
-                            linkxid,        /* OBJ-XID */
-                            t_obj_path,     /* H5SourcePath */
-                            t_targbuf,      /* TargetPath */
-                            targetxid,      /* TargetObj */
-                            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;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                    /* Try to create an OBJ-XID for the object pointed to */
+                    res = xml_name_to_XID(t_link_path, targetxid, (int)sizeof(targetxid), 0);
+                    if (res == 0) {
+                        /* target obj found */
+                        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, "<%sSoftLink LinkName=\"%s\" "
-                            "OBJ-XID=\"%s\" "
-                            "H5SourcePath=\"%s\" "
-                            "TargetPath=\"%s\"  "
-                            "Parents=\"%s\" H5ParentPaths=\"%s\" />",
-                            xmlnsprefix,
-                            t_name,         /* LinkName */
-                            linkxid,        /* OBJ-XID */
-                            t_obj_path,     /* H5SourcePath */
-                            t_targbuf,      /* TargetPath */
-                            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);
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
+                                "OBJ-XID=\"%s\" "
+                                "H5SourcePath=\"%s\" "
+                                "TargetPath=\"%s\" TargetObj=\"%s\" "
+                                "Parents=\"%s\" H5ParentPaths=\"%s\" />",
+                                xmlnsprefix,
+                                t_name,         /* LinkName */
+                                linkxid,        /* OBJ-XID */
+                                t_obj_path,     /* H5SourcePath */
+                                t_targbuf,      /* TargetPath */
+                                targetxid,      /* TargetObj */
+                                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;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "<%sSoftLink LinkName=\"%s\" "
+                                "OBJ-XID=\"%s\" "
+                                "H5SourcePath=\"%s\" "
+                                "TargetPath=\"%s\"  "
+                                "Parents=\"%s\" H5ParentPaths=\"%s\" />",
+                                xmlnsprefix,
+                                t_name,         /* LinkName */
+                                linkxid,        /* OBJ-XID */
+                                t_obj_path,     /* H5SourcePath */
+                                t_targbuf,      /* TargetPath */
+                                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_targbuf);
+                    HDfree(t_obj_path);
+                    HDfree(t_link_path);
                 }
 
-                HDfree(t_prefix);
-                HDfree(t_name);
-                HDfree(t_targbuf);
-                HDfree(t_obj_path);
-                HDfree(t_link_path);
+                HDfree(targbuf);
             }
-
-            HDfree(targbuf);
             break;
 
         case H5L_TYPE_EXTERNAL:
-            targbuf = (char *)HDmalloc(linfo->u.val_size);
-            HDassert(targbuf);
-
-            if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
-                error_msg("unable to get external link value\n");
+            if((targbuf = (char *)HDmalloc(linfo->u.val_size)) == NULL)  {
+                error_msg("unable to allocate buffer\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            } /* end if */
+            }
             else {
-                const char *filename;
-                const char *targname;
-
-                if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
-                    error_msg("unable to unpack external link value\n");
+                if(H5Lget_val(group, name, targbuf, linfo->u.val_size, H5P_DEFAULT) < 0) {
+                    error_msg("unable to get external link value\n");
                     h5tools_setstatus(EXIT_FAILURE);
                     ret = FAIL;
                 } /* end if */
                 else {
-                    char linkxid[100];
-                    char parentxid[100];
-                    char *t_name = xml_escape_the_name(name);
-                    char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
-                    char *t_obj_path = xml_escape_the_name(obj_path);
-                    char *t_filename = xml_escape_the_name(filename);
-                    char *t_targname = xml_escape_the_name(targname);
+                    const char *filename;
+                    const char *targname;
 
-                    /* Create OBJ-XIDs for the parent and object */
-                    xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
-                    xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
+                    if(H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &targname) < 0) {
+                        error_msg("unable to unpack external link value\n");
+                        h5tools_setstatus(EXIT_FAILURE);
+                        ret = FAIL;
+                    } /* end if */
+                    else {
+                        char linkxid[100];
+                        char parentxid[100];
+                        char *t_name = xml_escape_the_name(name);
+                        char *t_prefix = xml_escape_the_name(HDstrcmp(prefix,"") ? prefix : "/");
+                        char *t_obj_path = xml_escape_the_name(obj_path);
+                        char *t_filename = xml_escape_the_name(filename);
+                        char *t_targname = xml_escape_the_name(targname);
 
-                    ctx.need_prefix = TRUE;
-                    h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+                        /* Create OBJ-XIDs for the parent and object */
+                        xml_name_to_XID(t_obj_path, linkxid, (int)sizeof(linkxid), 1);
+                        xml_name_to_XID(prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                    /* Render the element */
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "<%sExternalLink LinkName=\"%s\" "
-                            "OBJ-XID=\"%s\" "
-                            "H5SourcePath=\"%s\" "
-                            "TargetFilename=\"%s\"  "
-                            "TargetPath=\"%s\"  "
-                            "Parents=\"%s\" H5ParentPaths=\"%s\" />",
-                            xmlnsprefix,
-                            t_name,         /* LinkName */
-                            linkxid,        /* OBJ-XID */
-                            t_obj_path,     /* H5SourcePath */
-                            filename,       /* TargetFilename */
-                            targname,       /* TargetPath*/
-                            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);
+                        ctx.need_prefix = TRUE;
+                        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
-                    HDfree(t_prefix);
-                    HDfree(t_name);
-                    HDfree(t_filename);
-                    HDfree(t_targname);
-                    HDfree(t_obj_path);
+                        /* Render the element */
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "<%sExternalLink LinkName=\"%s\" "
+                                "OBJ-XID=\"%s\" "
+                                "H5SourcePath=\"%s\" "
+                                "TargetFilename=\"%s\"  "
+                                "TargetPath=\"%s\"  "
+                                "Parents=\"%s\" H5ParentPaths=\"%s\" />",
+                                xmlnsprefix,
+                                t_name,         /* LinkName */
+                                linkxid,        /* OBJ-XID */
+                                t_obj_path,     /* H5SourcePath */
+                                filename,       /* TargetFilename */
+                                targname,       /* TargetPath*/
+                                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);
+                        HDfree(t_targname);
+                        HDfree(t_obj_path);
+                    } /* end else */
                 } /* end else */
-            } /* end else */
-            HDfree(targbuf);
+                HDfree(targbuf);
+            }
             break;
 
         case H5L_TYPE_ERROR:
         case H5L_TYPE_MAX:
-            HDassert(0);
-            /* fall through */
         case H5L_TYPE_HARD:
         default:
             {
@@ -674,7 +684,6 @@ xml_escape_the_name(const char *str)
     for (i = 0; i < len; i++) {
         size_t esc_len;
 
-        HDassert(ncp_len);
         if (*cp == '\'') {
             HDstrncpy(ncp, apos, ncp_len);
             esc_len = HDstrlen(apos);
@@ -768,7 +777,6 @@ xml_escape_the_string(const char *str, int slen)
     for (i = 0; i < len; i++) {
         size_t esc_len;
 
-        HDassert(ncp_len);
         if (*cp == '\\') {
             *ncp++ = '\\';
             *ncp = *cp;
@@ -1514,8 +1522,6 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
-                HDassert(0);
-                /* fall through */
             default:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -1968,22 +1974,26 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset,
                 for (i = 0; i < ndims; i++)
                     nelmts *= size[i];
 
-                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));
-                    datactx.need_prefix = TRUE;
-                    datactx.indent_level = ctx.indent_level;
-                    datactx.cur_column = ctx.cur_column;
-                    status = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id, p_type, space, buf);
+                if((buf = HDmalloc((size_t)(nelmts * MAX(H5Tget_size(type), H5Tget_size(p_type))))) == NULL)  {
+                    error_msg("unable to allocate buffer\n");
+                    h5tools_setstatus(EXIT_FAILURE);
+                    status = FAIL;
                 }
-                /* Reclaim any VL memory, if necessary */
-                if (vl_data)
-                    H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
+                else {
+                    if (H5Aread(obj_id, p_type, buf) >= 0) {
+                        h5tools_context_t datactx;
+                        HDmemset(&datactx, 0, sizeof(datactx));
+                        datactx.need_prefix = TRUE;
+                        datactx.indent_level = ctx.indent_level;
+                        datactx.cur_column = ctx.cur_column;
+                        status = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id, p_type, space, buf);
+                    }
+                    /* Reclaim any VL memory, if necessary */
+                    if (vl_data)
+                        H5Dvlen_reclaim(p_type, space, H5P_DEFAULT, buf);
 
-                HDfree(buf);
+                    HDfree(buf);
+                }
             }
             H5Tclose(p_type);
             H5Sclose(space);
@@ -2239,8 +2249,6 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 break;
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
-                HDassert(0);
-                /* fall through */
             default:
                 ctx.need_prefix = TRUE;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -3672,8 +3680,6 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             break;
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
-            HDassert(0);
-            /* fall through */
         case H5T_STRING:
         case H5T_REFERENCE:
         default:
@@ -3812,91 +3818,95 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
 
     /* Print information about storage layout */
     if (H5D_CHUNKED == H5Pget_layout(dcpl)) {
-        maxdims = H5Sget_simple_extent_ndims(space);
-        HDassert(maxdims >= 0);
-        chsize = (hsize_t *)HDmalloc((size_t)maxdims * sizeof(hsize_t));
-        ctx.indent_level++;
-        dump_indent += COL;
+        if((maxdims = H5Sget_simple_extent_ndims(space)) < 0)  {
+            error_msg("unable to get maxdims\n");
+            h5tools_setstatus(EXIT_FAILURE);
+        }
+        else {
+            chsize = (hsize_t *)HDmalloc((size_t)maxdims * sizeof(hsize_t));
+            ctx.indent_level++;
+            dump_indent += COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            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, "<%sStorageLayout>", 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;
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "<%sStorageLayout>", 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.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            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, "<%sChunkedLayout ", xmlnsprefix);
-        ndims = H5Pget_chunk(dcpl, maxdims, chsize);
-        h5tools_str_append(&buffer, "Ndims=\"%d\">", ndims);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "<%sChunkedLayout ", xmlnsprefix);
+            ndims = H5Pget_chunk(dcpl, maxdims, chsize);
+            h5tools_str_append(&buffer, "Ndims=\"%d\">", ndims);
+            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++;
+            dump_indent += COL;
 
-        for (i = 0; i < ndims; i++) {
+            for (i = 0; i < ndims; i++) {
+
+                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, "<%sChunkDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" />", xmlnsprefix, chsize[i]);
+                h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            }
 
             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, "<%sChunkDimension DimSize=\"%" H5_PRINTF_LL_WIDTH "u\" />", xmlnsprefix, chsize[i]);
+            h5tools_str_append(&buffer, "<%sRequiredFilter>", xmlnsprefix);
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-        }
-
-        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, "<%sRequiredFilter>", 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;
-        check_filters(dcpl);
-        ctx.indent_level--;
-        dump_indent -= COL;
+            ctx.indent_level++;
+            dump_indent += COL;
+            check_filters(dcpl);
+            ctx.indent_level--;
+            dump_indent -= COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            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, "</%sRequiredFilter>", xmlnsprefix);
-        h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "</%sRequiredFilter>", 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--;
+            dump_indent -= COL;
 
-        ctx.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            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, "</%sChunkedLayout>", 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;
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "</%sChunkedLayout>", 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.need_prefix = TRUE;
-        h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
+            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, "</%sStorageLayout>", 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;
-        HDfree(chsize);
+            /* Render the element */
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "</%sStorageLayout>", 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;
+            HDfree(chsize);
+        }
     }
     else if (H5D_CONTIGUOUS == H5Pget_layout(dcpl)) {
         ctx.indent_level++;
@@ -3984,8 +3994,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             h5tools_str_append(&buffer, "FillIfSet");
             break;
         case H5D_FILL_TIME_ERROR:
-            HDassert(0);
-            /* fall through */
         default:
             h5tools_str_append(&buffer, "?");
             break;
@@ -4005,8 +4013,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             break;
         case H5D_ALLOC_TIME_DEFAULT:
         case H5D_ALLOC_TIME_ERROR:
-            HDassert(0);
-            /* fall through */
         default:
             h5tools_str_append(&buffer, "?");
             break;
@@ -4233,9 +4239,6 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * s
             break;
         case H5T_NO_CLASS:
         case H5T_NCLASSES:
-            HDassert(0);
-            /* fall through */
-
         default:
             ctx.need_prefix = TRUE;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);