[svn-r29179] Revert of 29177 which breaks the autotools build.

Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
           autotools serial

16 files changed, 139 insertions, 257 deletions

diff --git a/tools/h5dump/CMakeTestsVDS.cmake b/tools/h5dump/CMakeTestsVDS.cmake
index cc68896..58287fa 100644
--- a/tools/h5dump/CMakeTestsVDS.cmake
+++ b/tools/h5dump/CMakeTestsVDS.cmake
@@ -22,11 +22,6 @@
       tvds_layout-3_2.ddl
       tvds_layout-4.ddl
       tvds_layout-5.ddl
-      vds-first.ddl
-      vds-gap1.ddl
-      vds-gap2.ddl
-      vds_layout-eiger.ddl
-      vds_layout-maxmin.ddl
   )
   set (HDF5_REFERENCE_TEST_VDS
       1_a.h5
@@ -52,14 +47,6 @@
       5_b.h5
       5_c.h5
       5_vds.h5
-      a.h5
-      b.h5
-      c.h5
-      d.h5
-      vds-percival-unlim-maxmin.h5
-      f-0.h5
-      f-3.h5
-      vds-eiger.h5
   )
   set (HDF5_ERROR_REFERENCE_VDS
   )
@@ -197,12 +184,6 @@
           tvds-4.out.err
           tvds-5.out
           tvds-5.out.err
-          vds-first.out
-          vds-first.out.err
-          vds-gap1.out
-          vds-gap1.out.err
-          vds-gap2.out
-          vds-gap2.out.err
           tvds_layout-1.out
           tvds_layout-1.out.err
           tvds_layout-2.out
@@ -215,10 +196,6 @@
           tvds_layout-4.out.err
           tvds_layout-5.out
           tvds_layout-5.out.err
-          vds_layout-eiger.out
-          vds_layout-eiger.out.err
-          vds_layout-maxmin.out
-          vds_layout-maxmin.out.err
     )
     set_tests_properties (H5DUMP_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds")
     if (NOT "${last_vds_test}" STREQUAL "")
@@ -248,9 +225,6 @@
     ADD_H5_VDS_TEST (tvds-3_2 0 --enable-error-stack 3_2_vds.h5)
     ADD_H5_VDS_TEST (tvds-4 0 --enable-error-stack 4_vds.h5)
     ADD_H5_VDS_TEST (tvds-5 0 --enable-error-stack 5_vds.h5)
-    ADD_H5_VDS_TEST (vds-first 0 --vds-view-first-missing --enable-error-stack vds-percival-unlim-maxmin.h5)
-    ADD_H5_VDS_TEST (vds-gap1 0 -d /VDS-Eiger --vds-gap-size=1 --enable-error-stack vds-eiger.h5)
-    ADD_H5_VDS_TEST (vds-gap2 0 --vds-gap-size=2 --enable-error-stack vds-eiger.h5)
   endif (USE_FILTER_DEFLATE)
 
   # Layout read
@@ -261,6 +235,4 @@
     ADD_H5_VDS_LAYOUT (tvds_layout-3_2 0 --enable-error-stack 3_2_vds.h5)
     ADD_H5_VDS_LAYOUT (tvds_layout-4 0 --enable-error-stack 4_vds.h5)
     ADD_H5_VDS_LAYOUT (tvds_layout-5 0 --enable-error-stack 5_vds.h5)
-    ADD_H5_VDS_LAYOUT (vds_layout-eiger 0 --enable-error-stack vds-eiger.h5)
-    ADD_H5_VDS_LAYOUT (vds_layout-maxmin 0 --enable-error-stack vds-percival-unlim-maxmin.h5)
   endif (USE_FILTER_DEFLATE)
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 7c24fa4..ffba581 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -71,7 +71,7 @@ struct handler_t {
  */
 /* The following initialization makes use of C language cancatenating */
 /* "xxx" "yyy" into "xxxyyy". */
-static const char *s_opts = "hn*peyBHirVa:c:d:f:g:k:l:t:w:xD:uX:o*b*F:s:S:A*q:z:m:RECM:O*N:vG:";
+static const char *s_opts = "hn*peyBHirVa:c:d:f:g:k:l:t:w:xD:uX:o*b*F:s:S:A*q:z:m:RECM:O*N:";
 static struct long_options l_opts[] = {
     { "help", no_arg, 'h' },
     { "hel", no_arg, 'h' },
@@ -190,8 +190,6 @@ static struct long_options l_opts[] = {
     { "no-compact-subset", no_arg, 'C' },
     { "ddl", optional_arg, 'O' },
     { "any_path", require_arg, 'N' },
-    { "vds-view-first-missing", no_arg, 'v' },
-    { "vds-gap-size", require_arg, 'G' },
     { NULL, 0, '\0' }
 };
 
@@ -258,8 +256,6 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "                          P can be the absolute path or just a relative path.\n");
     PRINTVALSTREAM(rawoutstream, "     -A,   --onlyattr     Print the header and value of attributes\n");
     PRINTVALSTREAM(rawoutstream, "                          Optional value 0 suppresses printing attributes.\n");
-    PRINTVALSTREAM(rawoutstream, "     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.\n");
-    PRINTVALSTREAM(rawoutstream, "     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers\n");
     PRINTVALSTREAM(rawoutstream, "--------------- Object Property Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, "     -i,   --object-ids   Print the object ids\n");
     PRINTVALSTREAM(rawoutstream, "     -p,   --properties   Print dataset filters, storage layout and fill value\n");
@@ -1125,16 +1121,6 @@ parse_start:
             }
             display_packed_bits = TRUE;
             break;
-        case 'v':
-            display_vds_first = TRUE;
-            break;
-        case 'G':
-            vds_gap_size = HDatoi(opt_arg);
-            if (vds_gap_size < 0) {
-                usage(h5tools_getprogname());
-                goto error;
-            }
-            break;
 
         /** begin XML parameters **/
         case 'x':
diff --git a/tools/h5dump/h5dump.h b/tools/h5dump/h5dump.h
index 7cf4efd..2b1fb04 100644
--- a/tools/h5dump/h5dump.h
+++ b/tools/h5dump/h5dump.h
@@ -78,8 +78,6 @@ int          enable_error_stack= FALSE; /* re-enable error stack */
 int          disable_compact_subset= FALSE; /* disable compact form of subset notation */
 int          display_packed_bits = FALSE; /*print 1-8 byte numbers as packed bits*/
 int          include_attrs     = TRUE; /* Display attributes */
-int          display_vds_first = FALSE; /* vds display to all by default*/
-int          vds_gap_size       = 0; /* vds skip missing files default is none */
 
 /* sort parameters */
 H5_index_t   sort_by           = H5_INDEX_NAME; /*sort_by [creation_order | name]  */
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c
index 09751ab..fd50710 100644
--- a/tools/h5dump/h5dump_ddl.c
+++ b/tools/h5dump/h5dump_ddl.c
@@ -26,12 +26,12 @@
 
 typedef struct {
     hid_t fid;                      /* File ID being traversed */
-    char *op_name;                    /* Object name wanted */
+    char *op_name;					/* Object name wanted */
 } trav_handle_udata_t;
 
 typedef struct {
-    char *path;                     /* Path of object being searched */
-    char *op_name;                    /* Object name wanted */
+	char *path;                     /* Path of object being searched */
+    char *op_name;					/* Object name wanted */
 } trav_attr_udata_t;
 
 /* callback function used by H5Literate() */
@@ -90,7 +90,7 @@ dump_dataspace(hid_t space)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent/COL;
     ctx.cur_column = dump_indent;
-
+   
     h5tools_dump_dataspace(rawoutstream, outputformat, &ctx, space);
 }
 
@@ -117,19 +117,19 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
     h5tools_context_t ctx;            /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
-
+    
     hid_t       attr_id;
     herr_t      ret = SUCCEED;
 
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent/COL;
     ctx.cur_column = dump_indent;
-
+    
     attr_id = H5Aopen(oid, attr_name, H5P_DEFAULT);
     oid_output = display_oid;
     data_output = display_data;
     attr_data_output = display_attr_data;
-
+    
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -155,7 +155,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *
         h5tools_setstatus(EXIT_FAILURE);
         ret = FAIL;
     }
-
+    
     return ret;
 }
 
@@ -185,7 +185,6 @@ static herr_t
 dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR_UNUSED *op_data)
 {
     hid_t       obj;
-    hid_t       dapl_id = H5P_DEFAULT;  /* dataset access property list ID */
     herr_t      ret = SUCCEED;
     char       *obj_path = NULL;    /* Full path of object */
     h5tools_str_t buffer;          /* string into which to render   */
@@ -200,7 +199,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent/COL;
     ctx.cur_column = dump_indent;
-
+    
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -223,8 +222,8 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
     if(!obj_path) {
         ret = FAIL;
         goto done;
-    }
-
+    } 
+    
     HDstrcpy(obj_path, prefix);
     HDstrcat(obj_path, "/");
     HDstrcat(obj_path, name);
@@ -270,20 +269,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
             break;
 
         case H5O_TYPE_DATASET:
-            if(display_data) {
-                if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) {
-                    error_msg("error in creating default access property list ID\n");
-                }
-                if (display_vds_first) {
-                    if(H5Pset_virtual_view(dapl_id, H5D_VDS_FIRST_MISSING) < 0)
-                        error_msg("error in setting access property list ID, virtual_view\n");
-                }
-                if (vds_gap_size > 0) {
-                    if(H5Pset_virtual_printf_gap(dapl_id, (hsize_t)vds_gap_size) < 0)
-                        error_msg("error in setting access property list ID, virtual_printf_gap\n");
-                }
-            }
-            if((obj = H5Dopen2(group, name, dapl_id)) >= 0) {
+            if((obj = H5Dopen2(group, name, H5P_DEFAULT)) >= 0) {
                 if(oinfo.rc > 1 || hit_elink) {
                     obj_t  *found_obj;    /* Found object */
 
@@ -322,11 +308,9 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
 
                         h5tools_setstatus(EXIT_FAILURE);
                         ret = FAIL;
-                        if (dapl_id != H5P_DEFAULT)
-                            H5Pclose(dapl_id);
                         H5Dclose(obj);
                         goto done;
-                    }
+                    } 
                     else if(found_obj->displayed) {
                         ctx.need_prefix = TRUE;
                         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
@@ -363,24 +347,18 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                             h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datasetend);
                         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                        if (dapl_id != H5P_DEFAULT)
-                            H5Pclose(dapl_id);
                         H5Dclose(obj);
                         goto done;
-                    }
+                    } 
                     else {
                         found_obj->displayed = TRUE;
                     }
                 } /* end if */
 
                 dump_function_table->dump_dataset_function(obj, name, NULL);
-                if (dapl_id != H5P_DEFAULT)
-                    H5Pclose(dapl_id);
                 H5Dclose(obj);
-            }
+            } 
             else {
-                if (dapl_id)
-                    H5Pclose(dapl_id && dapl_id != H5P_DEFAULT);
                 error_msg("unable to dump dataset \"%s\"\n", name);
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
@@ -392,7 +370,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                 error_msg("unable to dump datatype \"%s\"\n", name);
                 h5tools_setstatus(EXIT_FAILURE);
                 ret = FAIL;
-            }
+            } 
             else {
                 dump_function_table->dump_named_datatype_function(obj, name);
                 H5Tclose(obj);
@@ -430,7 +408,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
                 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 */
@@ -580,7 +558,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR
 done:
 
     h5tools_str_close(&buffer);
-
+    
     if(obj_path)
         HDfree(obj_path);
     return ret;
@@ -672,7 +650,7 @@ dump_named_datatype(hid_t tid, const char *name)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent/COL;
     ctx.cur_column = dump_indent;
-
+    
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -707,7 +685,7 @@ dump_named_datatype(hid_t tid, const char *name)
     }
 
     ctx.need_prefix = TRUE;
-
+    
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s \"%s\" %s",
@@ -740,7 +718,7 @@ dump_named_datatype(hid_t tid, const char *name)
         else
             found_obj->displayed = TRUE;
     } /* end if */
-
+    
     /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_print_datatype(rawoutstream, &buffer, outputformat, &ctx, tid, FALSE);
@@ -748,7 +726,7 @@ dump_named_datatype(hid_t tid, const char *name)
     if(H5Tget_class(tid) != H5T_COMPOUND) {
         h5tools_str_append(&buffer, ";");
     }
-
+    
     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
     /* print attributes */
@@ -835,7 +813,7 @@ dump_group(hid_t gid, const char *name)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent/COL;
     ctx.cur_column = dump_indent;
-
+    
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -861,7 +839,7 @@ dump_group(hid_t gid, const char *name)
                         h5tools_dump_header_format->groupbegin, name,
                         h5tools_dump_header_format->groupblockbegin);
     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;
 
@@ -970,7 +948,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     HDmemset(&ctx, 0, sizeof(ctx));
     ctx.indent_level = dump_indent/COL;
     ctx.cur_column = dump_indent;
-
+    
     string_dataformat = *outputformat;
 
     if (fp_format) {
@@ -1004,7 +982,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
 
     ctx.need_prefix = TRUE;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
-
+    
      /* Render the element */
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s \"%s\" %s",
@@ -1016,7 +994,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
 
     dump_indent += COL;
     ctx.indent_level++;
-
+    
     type = H5Dget_type(did);
     h5dump_type_table = type_table;
     h5tools_dump_datatype(rawoutstream, outputformat, &ctx, type);
@@ -1040,7 +1018,6 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     if(display_data) {
         int  data_loop = 1;
         int  i;
-
         if(display_packed_bits)
             data_loop = packed_bits_num;
         for(i=0; i<data_loop; i++) {
@@ -1065,7 +1042,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "DATA{ not yet implemented.}");
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
-
+                
                 ctx.indent_level--;
                 break;
 
@@ -1102,7 +1079,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
 
     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->datasetblockend)) {
@@ -1212,7 +1189,7 @@ dump_fcpl(hid_t fid)
     fdriver=H5Pget_driver(fapl);
     H5Pclose(fapl);
 #endif
-
+    
    /*-------------------------------------------------------------------------
     * SUPER_BLOCK
     *-------------------------------------------------------------------------
@@ -1331,54 +1308,54 @@ static herr_t
 attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data)
 {
     herr_t              ret = SUCCEED;
-    int                 i;
-    int                 j;
-    int                 k;
-    char               *obj_op_name;
+    int 				i;
+    int 				j;
+    int 				k;
+    char			   *obj_op_name;
     char               *obj_name;
-    trav_attr_udata_t  *attr_data = (trav_attr_udata_t*)_op_data;
+	trav_attr_udata_t  *attr_data = (trav_attr_udata_t*)_op_data;
     char               *buf = attr_data->path;
-    char               *op_name = attr_data->op_name;
+    char			   *op_name = attr_data->op_name;
 
     j = (int)HDstrlen(op_name) - 1;
     /* find the last / */
     while(j >= 0) {
-        if (op_name[j] == '/' && (j==0 || (j>0 && op_name[j-1]!='\\')))
-            break;
-        j--;
+    	if (op_name[j] == '/' && (j==0 || (j>0 && op_name[j-1]!='\\')))
+    		break;
+    	j--;
     }
 
     obj_op_name = h5tools_str_replace(op_name + j + 1, "\\/", "/");
 
     if(obj_op_name == NULL) {
-        h5tools_setstatus(EXIT_FAILURE);
-        ret = FAIL;
+    	h5tools_setstatus(EXIT_FAILURE);
+    	ret = FAIL;
     }
     else {
-        if(HDstrcmp(attr_name, obj_op_name)==0) {
-            /* object name */
-            i = (int)HDstrlen(buf);
-            j = (int)HDstrlen(op_name);
-            k = (size_t)i + 1 + (size_t)j + 1 + 2;
-            obj_name = (char *)HDmalloc((size_t)k);
-            if(obj_name == NULL) {
-                h5tools_setstatus(EXIT_FAILURE);
-                ret = FAIL;
-            }
-            else {
-                HDmemset(obj_name, '\0', (size_t)k);
-                if(op_name[0] != '/') {
-                    HDstrncat(obj_name, buf, (size_t)i + 1);
-                    if(buf[i-1] != '/')
-                        HDstrncat(obj_name, "/", (size_t)2);
-                }
-                HDstrncat(obj_name, op_name, (size_t)j + 1);
-
-                handle_attributes(oid, obj_name, NULL, 0, NULL);
-                HDfree(obj_name);
-            }
-        }
-        HDfree(obj_op_name);
+    	if(HDstrcmp(attr_name, obj_op_name)==0) {
+    	    /* object name */
+    	    i = (int)HDstrlen(buf);
+    	    j = (int)HDstrlen(op_name);
+    	    k = (size_t)i + 1 + (size_t)j + 1 + 2;
+    	    obj_name = (char *)HDmalloc((size_t)k);
+    	    if(obj_name == NULL) {
+    	    	h5tools_setstatus(EXIT_FAILURE);
+    	    	ret = FAIL;
+    	    }
+    	    else {
+    	    	HDmemset(obj_name, '\0', (size_t)k);
+    	        if(op_name[0] != '/') {
+    	        	HDstrncat(obj_name, buf, (size_t)i + 1);
+    	        	if(buf[i-1] != '/')
+    	            	HDstrncat(obj_name, "/", (size_t)2);
+    	        }
+    	        HDstrncat(obj_name, op_name, (size_t)j + 1);
+
+    	    	handle_attributes(oid, obj_name, NULL, 0, NULL);
+    	    	HDfree(obj_name);
+        	}
+    	}
+    	HDfree(obj_op_name);
     }
     return ret;
 } /* end attr_search() */
@@ -1386,7 +1363,7 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a
 static herr_t
 obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *already_visited, void *_op_data)
 {
-    trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
+	trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
     char *op_name = (char*)handle_data->op_name;
 
     trav_attr_udata_t  attr_data;
@@ -1395,22 +1372,22 @@ obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *al
     H5Aiterate_by_name(handle_data->fid, path, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_search, (void*)&attr_data, H5P_DEFAULT);
 
     if(HDstrcmp(path, op_name)==0) {
-        switch(oi->type) {
-        case H5O_TYPE_GROUP:
-            handle_groups(handle_data->fid, path, NULL, 0, NULL);
-            break;
-        case H5O_TYPE_DATASET:
-            handle_datasets(handle_data->fid, path, NULL, 0, NULL);
-            break;
-        case H5O_TYPE_NAMED_DATATYPE:
-            handle_datatypes(handle_data->fid, path, NULL, 0, NULL);
-            break;
-        case H5O_TYPE_UNKNOWN:
-        case H5O_TYPE_NTYPES:
-        default:
-            error_msg("unknown object type value\n");
-            h5tools_setstatus(EXIT_FAILURE);
-        } /* end switch */
+    	switch(oi->type) {
+    	case H5O_TYPE_GROUP:
+    		handle_groups(handle_data->fid, path, NULL, 0, NULL);
+    		break;
+    	case H5O_TYPE_DATASET:
+    		handle_datasets(handle_data->fid, path, NULL, 0, NULL);
+    		break;
+    	case H5O_TYPE_NAMED_DATATYPE:
+    		handle_datatypes(handle_data->fid, path, NULL, 0, NULL);
+    		break;
+    	case H5O_TYPE_UNKNOWN:
+    	case H5O_TYPE_NTYPES:
+    	default:
+    		error_msg("unknown object type value\n");
+    		h5tools_setstatus(EXIT_FAILURE);
+    	} /* end switch */
     }
 
     return 0;
@@ -1420,48 +1397,48 @@ static herr_t
 lnk_search(const char *path, const H5L_info_t *li, void *_op_data)
 {
     int         search_len;
-    int            k;
+    int			k;
     char       *search_name;
-    trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
+	trav_handle_udata_t  *handle_data = (trav_handle_udata_t*)_op_data;
     char *op_name = (char*)handle_data->op_name;
 
     search_len = HDstrlen(op_name);
     if(search_len > 0 && op_name[0] != '/') {
-        k = 2;
+    	k = 2;
     }
     else
         k = 1;
-    search_name = (char *)HDmalloc((size_t)(search_len + k));
+   	search_name = (char *)HDmalloc((size_t)(search_len + k));
     if(search_name == NULL) {
-        error_msg("creating temporary link\n");
-        h5tools_setstatus(EXIT_FAILURE);
+		error_msg("creating temporary link\n");
+    	h5tools_setstatus(EXIT_FAILURE);
     }
     else {
-        if (k == 2) {
-            HDstrcpy(search_name, "/");
-            HDstrncat(search_name, op_name, (size_t)search_len + 1);
-        }
-        else
-            HDstrncpy(search_name, op_name, (size_t)search_len + 1);
-        search_name[search_len + k - 1] = '\0';
-
-        if(HDstrcmp(path, search_name) == 0) {
-            switch(li->type) {
-            case H5L_TYPE_SOFT:
-            case H5L_TYPE_EXTERNAL:
-                handle_links(handle_data->fid, op_name, NULL, 0, NULL);
-                break;
-
-            case H5L_TYPE_HARD:
-            case H5L_TYPE_MAX:
-            case H5L_TYPE_ERROR:
-            default:
-                error_msg("unknown link type value\n");
-                h5tools_setstatus(EXIT_FAILURE);
-                break;
-            } /* end switch() */
-        }
-        HDfree(search_name);
+		if (k == 2) {
+			HDstrcpy(search_name, "/");
+			HDstrncat(search_name, op_name, (size_t)search_len + 1);
+		}
+		else
+			HDstrncpy(search_name, op_name, (size_t)search_len + 1);
+		search_name[search_len + k - 1] = '\0';
+
+		if(HDstrcmp(path, search_name) == 0) {
+			switch(li->type) {
+			case H5L_TYPE_SOFT:
+			case H5L_TYPE_EXTERNAL:
+				handle_links(handle_data->fid, op_name, NULL, 0, NULL);
+				break;
+
+			case H5L_TYPE_HARD:
+			case H5L_TYPE_MAX:
+			case H5L_TYPE_ERROR:
+			default:
+				error_msg("unknown link type value\n");
+				h5tools_setstatus(EXIT_FAILURE);
+				break;
+			} /* end switch() */
+		}
+		HDfree(search_name);
     }
     return 0;
 } /* end lnk_search() */
@@ -1488,7 +1465,7 @@ handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED * data, int H
         hid_t       gcpl_id;
         unsigned    crt_order_flags;
         unsigned    attr_crt_order_flags;
-        trav_handle_udata_t handle_udata;     /* User data for traversal */
+		trav_handle_udata_t handle_udata;     /* User data for traversal */
 
         if ((gcpl_id = H5Gget_create_plist(gid)) < 0) {
             error_msg("error in getting group creation property list ID\n");
@@ -1512,12 +1489,12 @@ handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED * data, int H
             h5tools_setstatus(EXIT_FAILURE);
         }
 
-        handle_udata.fid = fid;
-        handle_udata.op_name = (char*)path_name;
-        if(h5trav_visit(fid, "/", TRUE, TRUE, obj_search, lnk_search, &handle_udata) < 0) {
-            error_msg("error traversing information\n");
-            h5tools_setstatus(EXIT_FAILURE);
-        }
+		handle_udata.fid = fid;
+		handle_udata.op_name = (char*)path_name;
+		if(h5trav_visit(fid, "/", TRUE, TRUE, obj_search, lnk_search, &handle_udata) < 0) {
+			error_msg("error traversing information\n");
+			h5tools_setstatus(EXIT_FAILURE);
+		}
     }
 }
 
@@ -1559,7 +1536,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
 
     /* find the last / */
     while(j >= 0) {
-        if (attr[j] == '/' && (j==0 || (j>0 && attr[j-1]!='\\')))
+        if (attr[j] == '/' && (j==0 || (j>0 && attr[j-1]!='\\'))) 
             break;
         j--;
     }
@@ -1594,7 +1571,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
     string_dataformat.do_escape = display_escape;
     outputformat = &string_dataformat;
 
-    attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
+	attr_name = h5tools_str_replace(attr + j + 1, "\\/", "/");
 
     /* handle error case: cannot open the object with the attribute */
     if((oid = H5Oopen(fid, obj_name, H5P_DEFAULT)) < 0) {
@@ -1650,7 +1627,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H
     } /* end if */
 
     HDfree(obj_name);
-    HDfree(attr_name);
+	HDfree(attr_name);
     dump_indent -= COL;
     return;
 
@@ -1658,9 +1635,9 @@ error:
     h5tools_setstatus(EXIT_FAILURE);
     if(obj_name)
         HDfree(obj_name);
-
-    if (attr_name)
-        HDfree(attr_name);
+		
+	if (attr_name)
+		HDfree(attr_name);
 
     H5E_BEGIN_TRY {
         H5Oclose(oid);
@@ -1695,24 +1672,10 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
 {
     H5O_info_t       oinfo;
     hid_t            dsetid;
-    hid_t            dapl_id = H5P_DEFAULT;  /* dataset access property list ID */
     struct subset_t *sset = (struct subset_t *)data;
     const char      *real_name = display_name ? display_name : dset;
 
-    if(display_data) {
-        if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0) {
-            error_msg("error in creating default access property list ID\n");
-        }
-        if (display_vds_first) {
-            if(H5Pset_virtual_view(dapl_id, H5D_VDS_FIRST_MISSING) < 0)
-                error_msg("error in setting access property list ID, virtual_view\n");
-        }
-        if (vds_gap_size > 0) {
-            if(H5Pset_virtual_printf_gap(dapl_id, (hsize_t)vds_gap_size) < 0)
-                error_msg("error in setting access property list ID, virtual_printf_gap\n");
-        }
-    }
-    if((dsetid = H5Dopen2(fid, dset, dapl_id)) < 0) {
+    if((dsetid = H5Dopen2(fid, dset, H5P_DEFAULT)) < 0) {
         if (pe) {
             handle_links(fid, dset, data, pe, display_name);
         }
@@ -1789,7 +1752,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
             h5tools_setstatus(EXIT_FAILURE);
             return;
         }
-
+        
         /*-------------------------------------------------------------------------
          * check for block overlap
          *-------------------------------------------------------------------------
@@ -1822,7 +1785,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
                 PRINTSTREAM(rawoutstream, "%s \"%s\"\n", HARDLINK, found_obj->objname);
                 indentation(dump_indent);
                 end_obj(h5tools_dump_header_format->datasetend, h5tools_dump_header_format->datasetblockend);
-            }
+            } 
             else {
                 found_obj->displayed = TRUE;
                 dump_indent += COL;
@@ -1838,8 +1801,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
         dump_dataset(dsetid, real_name, sset);
         dump_indent -= COL;
     }
-    if (dapl_id != H5P_DEFAULT)
-        H5Pclose(dapl_id);
+
     if(H5Dclose(dsetid) < 0)
         h5tools_setstatus(EXIT_FAILURE);
 }
@@ -1922,11 +1884,11 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
     if(H5Lget_info(fid, links, &linfo, H5P_DEFAULT) < 0) {
         error_msg("unable to get link info from \"%s\"\n", links);
         h5tools_setstatus(EXIT_FAILURE);
-    }
+    } 
     else if(linfo.type == H5L_TYPE_HARD) {
         error_msg("\"%s\" is a hard link\n", links);
         h5tools_setstatus(EXIT_FAILURE);
-    }
+    } 
     else {
         char *buf = (char *)HDmalloc(linfo.u.val_size);
         PRINTVALSTREAM(rawoutstream, "\n");
@@ -1963,12 +1925,12 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT
                     PRINTSTREAM(rawoutstream, "TARGETFILE \"%s\"\n", elink_file);
                     indentation(COL);
                     PRINTSTREAM(rawoutstream, "TARGETPATH \"%s\"\n", elink_path);
-                }
+                } 
                 else {
                     error_msg("h5dump error: unable to unpack external link value for \"%s\"\n", links);
                     h5tools_setstatus(EXIT_FAILURE);
                 }
-            }
+            } 
             else {
                 error_msg("h5dump error: unable to get external link value for \"%s\"\n", links);
                 h5tools_setstatus(EXIT_FAILURE);
diff --git a/tools/h5dump/h5dump_extern.h b/tools/h5dump/h5dump_extern.h
index 62477d0..08f9e36 100644
--- a/tools/h5dump/h5dump_extern.h
+++ b/tools/h5dump/h5dump_extern.h
@@ -77,8 +77,6 @@ extern int          enable_error_stack; /* re-enable error stack */
 extern int          disable_compact_subset; /* disable compact form of subset notation */
 extern int          display_packed_bits; /*print 1-8 byte numbers as packed bits*/
 extern int          include_attrs; /* Display attributes */
-extern int          display_vds_first; /* vds display to first missing */
-extern int          vds_gap_size; /* vds skip missing files */
 
 /* sort parameters */
 extern H5_index_t   sort_by; /*sort_by [creation_order | name]  */
diff --git a/tools/h5dump/testh5dumpvds.sh.in b/tools/h5dump/testh5dumpvds.sh.in
index 850c03a..b15606f 100644
--- a/tools/h5dump/testh5dumpvds.sh.in
+++ b/tools/h5dump/testh5dumpvds.sh.in
@@ -98,14 +98,6 @@ $SRC_H5DUMP_TESTFILES/vds/5_a.h5
 $SRC_H5DUMP_TESTFILES/vds/5_b.h5
 $SRC_H5DUMP_TESTFILES/vds/5_c.h5
 $SRC_H5DUMP_TESTFILES/vds/5_vds.h5
-$SRC_H5DUMP_TESTFILES/vds/a.h5
-$SRC_H5DUMP_TESTFILES/vds/b.h5
-$SRC_H5DUMP_TESTFILES/vds/c.h5
-$SRC_H5DUMP_TESTFILES/vds/d.h5
-$SRC_H5DUMP_TESTFILES/vds/vds-percival-unlim-maxmin.h5
-$SRC_H5DUMP_TESTFILES/vds/f-0.h5
-$SRC_H5DUMP_TESTFILES/vds/f-3.h5
-$SRC_H5DUMP_TESTFILES/vds/vds-eiger.h5
 "
 
 LIST_OTHER_TEST_FILES="
@@ -121,11 +113,6 @@ $SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_1.ddl
 $SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_2.ddl
 $SRC_H5DUMP_TESTFILES/vds/tvds_layout-4.ddl
 $SRC_H5DUMP_TESTFILES/vds/tvds_layout-5.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-first.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-gap1.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-gap2.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds_layout-eiger.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds_layout-maxmin.ddl
 "
 
 LIST_ERROR_TEST_FILES="
@@ -493,9 +480,6 @@ if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST tvds-3_2.ddl --enable-error-stack 3_2_vds.h5
     TOOLTEST tvds-4.ddl --enable-error-stack 4_vds.h5
     TOOLTEST tvds-5.ddl --enable-error-stack 5_vds.h5
-    TOOLTEST vds-first.ddl --vds-view-first-missing --enable-error-stack vds-percival-unlim-maxmin.h5
-    TOOLTEST vds-gap1.ddl -d /VDS-Eiger --vds-gap-size=1 --enable-error-stack vds-eiger.h5
-    TOOLTEST vds-gap2.ddl --vds-gap-size=2 --enable-error-stack vds-eiger.h5
 fi
 
   # Layout read
@@ -506,8 +490,6 @@ if test $USE_FILTER_DEFLATE = "yes" ; then
     TOOLTEST tvds_layout-3_2.ddl -p --enable-error-stack 3_2_vds.h5
     TOOLTEST tvds_layout-4.ddl -p --enable-error-stack 4_vds.h5
     TOOLTEST tvds_layout-5.ddl -p --enable-error-stack 5_vds.h5
-    TOOLTEST vds_layout-eiger.ddl -p --enable-error-stack vds-eiger.h5
-    TOOLTEST vds_layout-maxmin.ddl -p --enable-error-stack vds-percival-unlim-maxmin.h5
 fi
 
 # Clean up temporary files/directories
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index 9b1fbcf..7631ae8 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -58,7 +58,7 @@ if (BUILD_TESTING)
   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}
+      SHARED
       HDF5_TOOL_PLUGIN_LIB_NAME_RELEASE
       HDF5_TOOL_PLUGIN_LIB_NAME_DEBUG
   )
@@ -72,13 +72,13 @@ if (BUILD_TESTING)
       TARGET     ${HDF5_TOOL_PLUGIN_LIB_TARGET}
       POST_BUILD
       COMMAND    ${CMAKE_COMMAND}
-      ARGS       -E copy_if_different
+      ARGS       -E copy_if_different 
           "$<TARGET_FILE:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
           "${CMAKE_BINARY_DIR}/plugins/$<TARGET_FILE_NAME:${HDF5_TOOL_PLUGIN_LIB_TARGET}>"
   )
 
   include (CMakeTests.cmake)
-
+  
 endif (BUILD_TESTING)
 
 ##############################################################################
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 0b39a2b..38c84a2 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -61,7 +61,7 @@ if (BUILD_SHARED_LIBS)
   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}
+      SHARED
       HDF5_TOOLS_LIB_NAME_RELEASE
       HDF5_TOOLS_LIB_NAME_DEBUG
   )
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 7ebefc6..444dd97 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index 1a1b7e8..64a2880 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index 2a2778a..cdb1f91 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 5e00073..6d2492a 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index f2574d4..4f56619 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 15c0abc..3432433 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index c62e290..e51a09e 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index 5621a60..ba6e46d 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
@@ -25,8 +25,6 @@ usage: h5dump [OPTIONS] files
                           P can be the absolute path or just a relative path.
      -A,   --onlyattr     Print the header and value of attributes
                           Optional value 0 suppresses printing attributes.
-     --vds-view-first-missing Set the VDS bounds to first missing mapped elements.
-     --vds-gap-size=N     Set the missing file gap size, N=non-negative integers
 --------------- Object Property Options ---------------
      -i,   --object-ids   Print the object ids
      -p,   --properties   Print dataset filters, storage layout and fill value