Squashed commit of private branch changes to support stackable VOL plugins.

	modified:   test/dsets.c

20 files changed, 27 insertions, 27 deletions

diff --git a/tools/test/h5dump/errfiles/filter_fail.err b/tools/test/h5dump/errfiles/filter_fail.err
index 6c936b7..f6d38b1 100644
--- a/tools/test/h5dump/errfiles/filter_fail.err
+++ b/tools/test/h5dump/errfiles/filter_fail.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_read(): read failed
     major: Virtual Object Layer
     minor: Read failed
-  #002: (file name) line (number) in H5VL_native_dataset_read(): can't read data
+  #002: (file name) line (number) in H5VL__native_dataset_read(): can't read data
     major: Dataset
     minor: Read failed
   #003: (file name) line (number) in H5D__read(): can't read data
diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
index 64d5aca..faa0c50 100644
--- a/tools/test/h5dump/errfiles/tall-1.err
+++ b/tools/test/h5dump/errfiles/tall-1.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
index 64d5aca..faa0c50 100644
--- a/tools/test/h5dump/errfiles/tall-2A.err
+++ b/tools/test/h5dump/errfiles/tall-2A.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
index 64d5aca..faa0c50 100644
--- a/tools/test/h5dump/errfiles/tall-2A0.err
+++ b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
index 64d5aca..faa0c50 100644
--- a/tools/test/h5dump/errfiles/tall-2B.err
+++ b/tools/test/h5dump/errfiles/tall-2B.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
index b2cc6b7..c008c06 100644
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
@@ -18,7 +18,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
@@ -31,7 +31,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
diff --git a/tools/test/h5dump/errfiles/tattr-3.err b/tools/test/h5dump/errfiles/tattr-3.err
index 3190c3d..2df0b01 100644
--- a/tools/test/h5dump/errfiles/tattr-3.err
+++ b/tools/test/h5dump/errfiles/tattr-3.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_attr_open(): attribute open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_attr_open(): unable to open attribute: 'attr'
+  #002: (file name) line (number) in H5VL__native_attr_open(): unable to open attribute: 'attr'
     major: Attribute
     minor: Can't open object
   #003: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
index d89b053..bd57b22 100644
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ b/tools/test/h5dump/errfiles/tattrregR.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
@@ -18,7 +18,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
diff --git a/tools/test/h5dump/errfiles/tcomp-3.err b/tools/test/h5dump/errfiles/tcomp-3.err
index 3462761..5601cb9 100644
--- a/tools/test/h5dump/errfiles/tcomp-3.err
+++ b/tools/test/h5dump/errfiles/tcomp-3.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_datatype_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_datatype_open(): unable to open named datatype
+  #002: (file name) line (number) in H5VL__native_datatype_open(): unable to open named datatype
     major: Datatype
     minor: Can't open object
   #003: (file name) line (number) in H5T__open_name(): not found
diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
index d89b053..bd57b22 100644
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ b/tools/test/h5dump/errfiles/tdataregR.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
@@ -18,7 +18,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to dereference object
     major: References
     minor: Can't open object
   #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
index b2a60cd..1fd7edb 100644
--- a/tools/test/h5dump/errfiles/tdset-2.err
+++ b/tools/test/h5dump/errfiles/tdset-2.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+  #002: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
   #003: (file name) line (number) in H5D__open_name(): not found
@@ -30,7 +30,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_link_get(): get failed
     major: Virtual Object Layer
     minor: Can't get value
-  #002: (file name) line (number) in H5VL_native_link_get(): unable to get link info
+  #002: (file name) line (number) in H5VL__native_link_get(): unable to get link info
     major: Links
     minor: Object not found
   #003: (file name) line (number) in H5L_get_info(): name doesn't exist
diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
index f516638..abeef52 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
@@ -39,7 +39,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/textlinkfar.err b/tools/test/h5dump/errfiles/textlinkfar.err
index ba06406..43ab092 100644
--- a/tools/test/h5dump/errfiles/textlinkfar.err
+++ b/tools/test/h5dump/errfiles/textlinkfar.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/textlinksrc.err b/tools/test/h5dump/errfiles/textlinksrc.err
index ba06406..43ab092 100644
--- a/tools/test/h5dump/errfiles/textlinksrc.err
+++ b/tools/test/h5dump/errfiles/textlinksrc.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/tgroup-2.err b/tools/test/h5dump/errfiles/tgroup-2.err
index af220b8..6ffb426 100644
--- a/tools/test/h5dump/errfiles/tgroup-2.err
+++ b/tools/test/h5dump/errfiles/tgroup-2.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_group_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_group_open(): unable to open group
+  #002: (file name) line (number) in H5VL__native_group_open(): unable to open group
     major: Symbol table
     minor: Can't open object
   #003: (file name) line (number) in H5G__open_name(): group not found
diff --git a/tools/test/h5dump/errfiles/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
index 1336de5..cd47d90 100644
--- a/tools/test/h5dump/errfiles/torderlinks1.err
+++ b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
index 1336de5..cd47d90 100644
--- a/tools/test/h5dump/errfiles/torderlinks2.err
+++ b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_object_open(): open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+  #002: (file name) line (number) in H5VL__native_object_open(): unable to open object by name
     major: Object header
     minor: Can't open object
   #003: (file name) line (number) in H5O_open_name(): object not found
diff --git a/tools/test/h5dump/errfiles/tperror.err b/tools/test/h5dump/errfiles/tperror.err
index 4df7265..cf4127d 100644
--- a/tools/test/h5dump/errfiles/tperror.err
+++ b/tools/test/h5dump/errfiles/tperror.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+  #002: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
   #003: (file name) line (number) in H5D__open_name(): not found
@@ -30,7 +30,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_link_get(): get failed
     major: Virtual Object Layer
     minor: Can't get value
-  #002: (file name) line (number) in H5VL_native_link_get(): unable to get link info
+  #002: (file name) line (number) in H5VL__native_link_get(): unable to get link info
     major: Links
     minor: Object not found
   #003: (file name) line (number) in H5L_get_info(): name doesn't exist
diff --git a/tools/test/h5dump/errfiles/tslink-D.err b/tools/test/h5dump/errfiles/tslink-D.err
index ded6719..6d2be80 100644
--- a/tools/test/h5dump/errfiles/tslink-D.err
+++ b/tools/test/h5dump/errfiles/tslink-D.err
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
     major: Virtual Object Layer
     minor: Can't open object
-  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+  #002: (file name) line (number) in H5VL__native_dataset_open(): unable to open dataset
     major: Dataset
     minor: Can't open object
   #003: (file name) line (number) in H5D__open_name(): not found
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 6009723..7c01137 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -5,7 +5,7 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in H5VL_dataset_create(): create failed
     major: Virtual Object Layer
     minor: Unable to initialize object
-  #002: (file name) line (number) in H5VL_native_dataset_create(): unable to create dataset
+  #002: (file name) line (number) in H5VL__native_dataset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
   #003: (file name) line (number) in H5D__create_named(): unable to create and link to dataset