[svn-r29291] Merge of r29226-29259 from trunk.

Mostly java JNI + a few smaller merges.

Tested on: h5committest.new
           jam w/ java

20 files changed, 174 insertions, 234 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 7c24fa4..553db93 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -244,7 +244,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "     -o F, --output=F     Output raw data into file F\n");
     PRINTVALSTREAM(rawoutstream, "     -b B, --binary=B     Binary file output, of form B\n");
     PRINTVALSTREAM(rawoutstream, "     -O F, --ddl=F        Output ddl text into file F\n");
-    PRINTVALSTREAM(rawoutstream, "                          Do not use filename F to suppress ddl display\n");
+    PRINTVALSTREAM(rawoutstream, "                          Use blank(empty) filename F to suppress ddl display\n");
     PRINTVALSTREAM(rawoutstream, "--------------- Object Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -a P, --attribute=P  Print the specified attribute\n");
     PRINTVALSTREAM(rawoutstream, "                          If an attribute name contains a slash (/), escape the\n");
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 9b1fbcf..d8542a4 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -56,12 +56,7 @@ if (BUILD_TESTING)
   add_library (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED dynlib_rpk.c)
   TARGET_C_PROPERTIES (${HDF5_TOOL_PLUGIN_LIB_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
-  H5_SET_LIB_OPTIONS (
-      ${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TOOL_PLUGIN_LIB_NAME}
-      SHARED ${HDF5_PACKAGE_SOVERSION}
-      HDF5_TOOL_PLUGIN_LIB_NAME_RELEASE
-      HDF5_TOOL_PLUGIN_LIB_NAME_DEBUG
-  )
+  H5_SET_LIB_OPTIONS (${HDF5_TOOL_PLUGIN_LIB_TARGET} ${HDF5_TOOL_PLUGIN_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION})
 
   # make plugins dir
   file (MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugins")
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 0b39a2b..ce1ad34 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -41,13 +41,8 @@ add_library (${HDF5_TOOLS_LIB_TARGET} STATIC ${H5_TOOLS_LIB_SRCS} ${H5_TOOLS_LIB
 TARGET_C_PROPERTIES (${HDF5_TOOLS_LIB_TARGET} STATIC " " " ")
 target_link_libraries (${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIB_TARGET}")
-H5_SET_LIB_OPTIONS (
-    ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TOOLS_LIB_NAME}
-    STATIC
-    HDF5_TOOLS_LIB_NAME_RELEASE
-    HDF5_TOOLS_LIB_NAME_DEBUG
-)
-set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES 
+H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIB_TARGET} ${HDF5_TOOLS_LIB_NAME} STATIC)
+set_target_properties (${HDF5_TOOLS_LIB_TARGET} PROPERTIES
     FOLDER libraries/tools
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
@@ -59,13 +54,8 @@ if (BUILD_SHARED_LIBS)
   TARGET_C_PROPERTIES (${HDF5_TOOLS_LIBSH_TARGET} SHARED " " " ")
   target_link_libraries (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET})
   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_TOOLS_LIBSH_TARGET}")
-  H5_SET_LIB_OPTIONS (
-      ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TOOLS_LIB_NAME}
-      SHARED ${HDF5_TOOLS_PACKAGE_SOVERSION}
-      HDF5_TOOLS_LIB_NAME_RELEASE
-      HDF5_TOOLS_LIB_NAME_DEBUG
-  )
-  set_target_properties (${HDF5_TOOLS_LIBSH_TARGET} PROPERTIES 
+  H5_SET_LIB_OPTIONS (${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_TOOLS_LIB_NAME} SHARED ${HDF5_TOOLS_PACKAGE_SOVERSION})
+  set_target_properties (${HDF5_TOOLS_LIBSH_TARGET} PROPERTIES
       FOLDER libraries/tools
       COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB"
       INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 5d91276..9e285a9 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2869,7 +2869,7 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
  *-------------------------------------------------------------------------
  */
 static void
-h5tools_print_virtual_selection(hid_t vspace, 
+h5tools_print_virtual_selection(hid_t vspace,
         FILE *stream, const h5tool_format_t *info,
         h5tools_context_t *ctx/*in,out*/,
         h5tools_str_t *buffer/*string into which to render */,
@@ -3308,175 +3308,176 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     * FILTERS
     *-------------------------------------------------------------------------
     */
-
+    if (H5D_VIRTUAL != stl) {
     ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-
-    h5tools_str_reset(&buffer);
-    h5tools_str_append(&buffer, "%s %s", FILTERS, BEGIN);
-    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-    ctx->indent_level++;
+        h5tools_str_reset(&buffer);
+        h5tools_str_append(&buffer, "%s %s", FILTERS, BEGIN);
+        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    if(nfilters) {
-        for(i = 0; i < nfilters; i++) {
-            cd_nelmts = NELMTS(cd_values);
-            filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
-                cd_values, sizeof(f_name), f_name, NULL);
+        ctx->indent_level++;
 
-            if(filtn < 0)
-                continue; /* nothing to print for invalid filter */
+        if(nfilters) {
+            for(i = 0; i < nfilters; i++) {
+                cd_nelmts = NELMTS(cd_values);
+                filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
+                    cd_values, sizeof(f_name), f_name, NULL);
 
-            ctx->need_prefix = TRUE;
-            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                if(filtn < 0)
+                    continue; /* nothing to print for invalid filter */
 
-            h5tools_str_reset(&buffer);
-            switch(filtn) {
-                case H5Z_FILTER_DEFLATE:
-                    h5tools_str_append(&buffer, "%s %s %s %d %s", DEFLATE, BEGIN, DEFLATE_LEVEL, cd_values[0], END);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-                case H5Z_FILTER_SHUFFLE:
-                    h5tools_str_append(&buffer, "%s", SHUFFLE);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-                case H5Z_FILTER_FLETCHER32:
-                    h5tools_str_append(&buffer, "%s", FLETCHER32);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-                case H5Z_FILTER_SZIP:
-                    szip_options_mask = cd_values[0];;
-                    szip_pixels_per_block = cd_values[1];
-
-                    h5tools_str_append(&buffer, "%s %s", SZIP, BEGIN);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                ctx->need_prefix = TRUE;
+                h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    ctx->indent_level++;
+                h5tools_str_reset(&buffer);
+                switch(filtn) {
+                    case H5Z_FILTER_DEFLATE:
+                        h5tools_str_append(&buffer, "%s %s %s %d %s", DEFLATE, BEGIN, DEFLATE_LEVEL, cd_values[0], END);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        break;
+                    case H5Z_FILTER_SHUFFLE:
+                        h5tools_str_append(&buffer, "%s", SHUFFLE);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        break;
+                    case H5Z_FILTER_FLETCHER32:
+                        h5tools_str_append(&buffer, "%s", FLETCHER32);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        break;
+                    case H5Z_FILTER_SZIP:
+                        szip_options_mask = cd_values[0];;
+                        szip_pixels_per_block = cd_values[1];
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                        h5tools_str_append(&buffer, "%s %s", SZIP, BEGIN);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        ctx->indent_level++;
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                        ctx->need_prefix = TRUE;
+                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    h5tools_str_reset(&buffer);
-                    if(szip_options_mask & H5_SZIP_CHIP_OPTION_MASK)
-                        h5tools_str_append(&buffer, "MODE %s", "HARDWARE");
-                    else if(szip_options_mask & H5_SZIP_ALLOW_K13_OPTION_MASK)
-                        h5tools_str_append(&buffer, "MODE %s", "K13");
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                        ctx->need_prefix = TRUE;
+                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    h5tools_str_reset(&buffer);
-                    if(szip_options_mask & H5_SZIP_EC_OPTION_MASK)
-                        h5tools_str_append(&buffer, "CODING %s", "ENTROPY");
-                    else if(szip_options_mask & H5_SZIP_NN_OPTION_MASK)
-                        h5tools_str_append(&buffer, "CODING %s", "NEAREST NEIGHBOUR");
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        h5tools_str_reset(&buffer);
+                        if(szip_options_mask & H5_SZIP_CHIP_OPTION_MASK)
+                            h5tools_str_append(&buffer, "MODE %s", "HARDWARE");
+                        else if(szip_options_mask & H5_SZIP_ALLOW_K13_OPTION_MASK)
+                            h5tools_str_append(&buffer, "MODE %s", "K13");
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                        ctx->need_prefix = TRUE;
+                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    h5tools_str_reset(&buffer);
-                    if(szip_options_mask & H5_SZIP_LSB_OPTION_MASK)
-                        h5tools_str_append(&buffer, "BYTE_ORDER %s", "LSB");
-                    else if(szip_options_mask & H5_SZIP_MSB_OPTION_MASK)
-                        h5tools_str_append(&buffer, "BYTE_ORDER %s", "MSB");
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        h5tools_str_reset(&buffer);
+                        if(szip_options_mask & H5_SZIP_EC_OPTION_MASK)
+                            h5tools_str_append(&buffer, "CODING %s", "ENTROPY");
+                        else if(szip_options_mask & H5_SZIP_NN_OPTION_MASK)
+                            h5tools_str_append(&buffer, "CODING %s", "NEAREST NEIGHBOUR");
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-                    if(szip_options_mask & H5_SZIP_RAW_OPTION_MASK) {
                         ctx->need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
-                        h5tools_str_append(&buffer, "HEADER %s", "RAW");
+                        if(szip_options_mask & H5_SZIP_LSB_OPTION_MASK)
+                            h5tools_str_append(&buffer, "BYTE_ORDER %s", "LSB");
+                        else if(szip_options_mask & H5_SZIP_MSB_OPTION_MASK)
+                            h5tools_str_append(&buffer, "BYTE_ORDER %s", "MSB");
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    }
 
-                    ctx->indent_level--;
+                        if(szip_options_mask & H5_SZIP_RAW_OPTION_MASK) {
+                            ctx->need_prefix = TRUE;
+                            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                            h5tools_str_reset(&buffer);
+                            h5tools_str_append(&buffer, "HEADER %s", "RAW");
+                            h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        }
 
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "%s", END);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-                case H5Z_FILTER_NBIT:
-                    h5tools_str_append(&buffer, "%s", NBIT);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-                case H5Z_FILTER_SCALEOFFSET:
-                    h5tools_str_append(&buffer, "%s %s %s %d %s", SCALEOFFSET, BEGIN, SCALEOFFSET_MINBIT, cd_values[0], END);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-                default:
-                    h5tools_str_append(&buffer, "%s %s", "USER_DEFINED_FILTER", BEGIN);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        ctx->indent_level--;
 
-                    ctx->indent_level++;
+                        ctx->need_prefix = TRUE;
+                        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+                        h5tools_str_reset(&buffer);
+                        h5tools_str_append(&buffer, "%s", END);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        break;
+                    case H5Z_FILTER_NBIT:
+                        h5tools_str_append(&buffer, "%s", NBIT);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        break;
+                    case H5Z_FILTER_SCALEOFFSET:
+                        h5tools_str_append(&buffer, "%s %s %s %d %s", SCALEOFFSET, BEGIN, SCALEOFFSET_MINBIT, cd_values[0], END);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        break;
+                    default:
+                        h5tools_str_append(&buffer, "%s %s", "USER_DEFINED_FILTER", BEGIN);
+                        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "FILTER_ID %d", filtn);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        ctx->indent_level++;
 
-                    if(f_name[0] != '\0') {
                         ctx->need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
-                        h5tools_str_append(&buffer, "COMMENT %s", f_name);
+                        h5tools_str_append(&buffer, "FILTER_ID %d", filtn);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    }
-                    if (cd_nelmts) {
+
+                        if(f_name[0] != '\0') {
+                            ctx->need_prefix = TRUE;
+                            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+
+                            h5tools_str_reset(&buffer);
+                            h5tools_str_append(&buffer, "COMMENT %s", f_name);
+                            h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        }
+                        if (cd_nelmts) {
+                            ctx->need_prefix = TRUE;
+                            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+
+                            h5tools_str_reset(&buffer);
+                            h5tools_str_append(&buffer, "%s %s ","PARAMS", BEGIN);
+                            for (j=0; j<cd_nelmts; j++)
+                                h5tools_str_append(&buffer, "%d ", cd_values[j]);
+                            h5tools_str_append(&buffer, "%s", END);
+                            h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+                        }
+                        ctx->indent_level--;
+
                         ctx->need_prefix = TRUE;
                         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
                         h5tools_str_reset(&buffer);
-                        h5tools_str_append(&buffer, "%s %s ","PARAMS", BEGIN);
-                        for (j=0; j<cd_nelmts; j++)
-                            h5tools_str_append(&buffer, "%d ", cd_values[j]);
-                        h5tools_str_append(&buffer, "%s", END);
+                        h5tools_str_append(&buffer, "%s",END);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    }
-                    ctx->indent_level--;
+                        break;
+                }/*switch*/
+            } /*i*/
+        }/*nfilters*/
+        else {
 
-                    ctx->need_prefix = TRUE;
-                    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+            ctx->need_prefix = TRUE;
+            h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-                    h5tools_str_reset(&buffer);
-                    h5tools_str_append(&buffer, "%s",END);
-                    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-                    break;
-            }/*switch*/
-        } /*i*/
-    }/*nfilters*/
-    else {
+            h5tools_str_reset(&buffer);
+            h5tools_str_append(&buffer, "NONE");
+            h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+        }
+        ctx->indent_level--;
 
         ctx->need_prefix = TRUE;
         h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
         h5tools_str_reset(&buffer);
-        h5tools_str_append(&buffer, "NONE");
+        h5tools_str_append(&buffer, "%s",END);
         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
-    }
-    ctx->indent_level--;
-
-    ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
-
-    h5tools_str_reset(&buffer);
-    h5tools_str_append(&buffer, "%s",END);
-    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+    } /* end if (H5D_VIRTUAL != stl) */
 
     /*-------------------------------------------------------------------------
     * FILLVALUE
@@ -3552,46 +3553,48 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
     * ALLOCATION_TIME
     *-------------------------------------------------------------------------
     */
-    ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+    if (H5D_VIRTUAL != stl) {
+        ctx->need_prefix = TRUE;
+        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-    h5tools_str_reset(&buffer);
-    h5tools_str_append(&buffer, "ALLOCATION_TIME %s", BEGIN);
-    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+        h5tools_str_reset(&buffer);
+        h5tools_str_append(&buffer, "ALLOCATION_TIME %s", BEGIN);
+        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    ctx->indent_level++;
+        ctx->indent_level++;
 
-    ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+        ctx->need_prefix = TRUE;
+        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-    h5tools_str_reset(&buffer);
-    H5Pget_alloc_time(dcpl_id, &at);
-    switch(at) {
-        case H5D_ALLOC_TIME_EARLY:
-            h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_EARLY");
-            break;
-        case H5D_ALLOC_TIME_INCR:
-            h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_INCR");
-            break;
-        case H5D_ALLOC_TIME_LATE:
-            h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_LATE");
-            break;
-        case H5D_ALLOC_TIME_ERROR:
-        case H5D_ALLOC_TIME_DEFAULT:
-        default:
-            HDassert(0);
-            break;
-    }
-    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+        h5tools_str_reset(&buffer);
+        H5Pget_alloc_time(dcpl_id, &at);
+        switch(at) {
+            case H5D_ALLOC_TIME_EARLY:
+                h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_EARLY");
+                break;
+            case H5D_ALLOC_TIME_INCR:
+                h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_INCR");
+                break;
+            case H5D_ALLOC_TIME_LATE:
+                h5tools_str_append(&buffer, "%s", "H5D_ALLOC_TIME_LATE");
+                break;
+            case H5D_ALLOC_TIME_ERROR:
+            case H5D_ALLOC_TIME_DEFAULT:
+            default:
+                HDassert(0);
+                break;
+        }
+        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    ctx->indent_level--;
+        ctx->indent_level--;
 
-    ctx->need_prefix = TRUE;
-    h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
+        ctx->need_prefix = TRUE;
+        h5tools_simple_prefix(stream, info, ctx, curr_pos, 0);
 
-    h5tools_str_reset(&buffer);
-    h5tools_str_append(&buffer, "%s", END);
-    h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+        h5tools_str_reset(&buffer);
+        h5tools_str_append(&buffer, "%s", END);
+        h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
+    } /* end if (H5D_VIRTUAL != stl) */
 
     h5tools_str_close(&buffer);
 }
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 7ebefc6..fe22a1b 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index 1a1b7e8..767cbbf 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index 2a2778a..d791b41 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 5e00073..5235aa7 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index f2574d4..697bff8 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 15c0abc..900c0b5 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index c62e290..65123d0 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index 5621a60..d352e34 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
@@ -11,7 +11,7 @@ usage: h5dump [OPTIONS] files
      -o F, --output=F     Output raw data into file F
      -b B, --binary=B     Binary file output, of form B
      -O F, --ddl=F        Output ddl text into file F
-                          Do not use filename F to suppress ddl display
+                          Use blank(empty) filename F to suppress ddl display
 --------------- Object Options ---------------
      -a P, --attribute=P  Print the specified attribute
                           If an attribute name contains a slash (/), escape the
diff --git a/tools/testfiles/vds/tvds_layout-1.ddl b/tools/testfiles/vds/tvds_layout-1.ddl
index 5d8a62c..b5351f2 100644
--- a/tools/testfiles/vds/tvds_layout-1.ddl
+++ b/tools/testfiles/vds/tvds_layout-1.ddl
@@ -125,16 +125,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  -9
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
       DATA {
       (0,0,0): 10, 10, 10, 10, 10, 10, 10, 10,
       (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
diff --git a/tools/testfiles/vds/tvds_layout-2.ddl b/tools/testfiles/vds/tvds_layout-2.ddl
index af6b718..53407c7 100644
--- a/tools/testfiles/vds/tvds_layout-2.ddl
+++ b/tools/testfiles/vds/tvds_layout-2.ddl
@@ -105,16 +105,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  -9
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
       DATA {
       (0,0,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
       (0,1,0): 10, 10, 10, 10, 10, 10, 10, 40, 40, 40, 40, 40, 40, 40,
diff --git a/tools/testfiles/vds/tvds_layout-3_1.ddl b/tools/testfiles/vds/tvds_layout-3_1.ddl
index 968327d..e75fe36 100644
--- a/tools/testfiles/vds/tvds_layout-3_1.ddl
+++ b/tools/testfiles/vds/tvds_layout-3_1.ddl
@@ -125,16 +125,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  -9
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
       DATA {
       (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9,
       (0,1,0): 10, 10, 10, 10, 10, 10, 10, 10,
diff --git a/tools/testfiles/vds/tvds_layout-3_2.ddl b/tools/testfiles/vds/tvds_layout-3_2.ddl
index 7e14ec2..5b63269 100644
--- a/tools/testfiles/vds/tvds_layout-3_2.ddl
+++ b/tools/testfiles/vds/tvds_layout-3_2.ddl
@@ -105,16 +105,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  -9
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
       DATA {
       (0,0,0): -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9,
       (0,0,15): -9, -9, -9, -9,
diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/testfiles/vds/tvds_layout-4.ddl
index 018644e..a449d0c 100644
--- a/tools/testfiles/vds/tvds_layout-4.ddl
+++ b/tools/testfiles/vds/tvds_layout-4.ddl
@@ -25,16 +25,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  -9
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
       DATA {
       (0,0,0): 10, 10, 10, 10,
       (0,1,0): 10, 10, 10, 10,
diff --git a/tools/testfiles/vds/tvds_layout-5.ddl b/tools/testfiles/vds/tvds_layout-5.ddl
index b43629a..1698eb4 100644
--- a/tools/testfiles/vds/tvds_layout-5.ddl
+++ b/tools/testfiles/vds/tvds_layout-5.ddl
@@ -65,16 +65,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  -9
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_INCR
-      }
       DATA {
       (0,0,0): 10, 10, 10, 10,
       (0,1,0): 10, 10, 10, 10,
diff --git a/tools/testfiles/vds/vds_layout-eiger.ddl b/tools/testfiles/vds/vds_layout-eiger.ddl
index 4a43606..d32a139 100644
--- a/tools/testfiles/vds/vds_layout-eiger.ddl
+++ b/tools/testfiles/vds/vds_layout-eiger.ddl
@@ -20,16 +20,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  H5D_FILL_VALUE_DEFAULT
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_LATE
-      }
       DATA {
       (0,0,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
       (0,1,0): 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/tools/testfiles/vds/vds_layout-maxmin.ddl b/tools/testfiles/vds/vds_layout-maxmin.ddl
index 9e0dee5..790fc1c 100644
--- a/tools/testfiles/vds/vds_layout-maxmin.ddl
+++ b/tools/testfiles/vds/vds_layout-maxmin.ddl
@@ -85,16 +85,10 @@ GROUP "/" {
             }
          }
       }
-      FILTERS {
-         NONE
-      }
       FILLVALUE {
          FILL_TIME H5D_FILL_TIME_IFSET
          VALUE  H5D_FILL_VALUE_DEFAULT
       }
-      ALLOCATION_TIME {
-         H5D_ALLOC_TIME_LATE
-      }
       DATA {
       (0,0,0): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
       (0,1,0): 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,