From 6ff2efb37bf53623b18b1107dde37a36fa2f1f52 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 4 Jan 2018 11:10:34 -0600
Subject: [PATCH] HDFFV-9724 Merge vds prefix from develop

---
 release_docs/RELEASE.txt | 37 ++++++++++++++++++-------------------
 src/H5Fquery.c           | 12 ++++--------
 test/vds.c               |  2 +-
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 46e0c59d74..952c01fc32 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -85,6 +85,20 @@ New Features
 
     Library:
     --------
+    - Add prefix option to VDS files.
+
+      Currently, VDS source files must be in the active directory to be
+      found by the virtual file. Adding the option of a prefix to be set
+      on the virtual file, using a data access property list (DAPL),
+      allows the source files to located at an absolute or relative path
+      to the virtual file.
+
+      New public APIs:
+            herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix);
+            ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
+      The prefix can also be set with an environment variable, HDF5_VDS_PREFIX.
+
+      (ADB - 2017/12/12, HDFFV-9724)
 
     - H5FDdriver_query() API call added to the C library.
 
@@ -120,21 +134,6 @@ New Features
 
       (HDFFV-10252, DER, 2017/04/05)
 
-    - Add prefix option to VDS files.
-
-      Currently, VDS source files must be in the active directory to be
-      found by the virtual file. Adding the option of a prefix to be set
-      on the virtual file, using a data access property list (DAPL),
-      allows the source files to located at an absolute or relative path
-      to the virtual file.
-
-      New public APIs:
-            herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix);
-            ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
-      The prefix can also be set with an environment variable, HDF5_VDS_PREFIX.
-
-      (ADB - 2017/12/12, HDFFV-9724)
-
 
     Parallel Library:
     -----------------
@@ -267,13 +266,13 @@ Bug Fixes since HDF5-1.10.1 release
 
     - Fix H5Sencode() bug when the number of elements selected is > 2^32
 
-      H5Sencode() incorrectly encodes dataspace selection with number of 
-      elements exceeding 2^32.  When decoding such selection via H5Sdecode(), 
+      H5Sencode() incorrectly encodes dataspace selection with number of
+      elements exceeding 2^32.  When decoding such selection via H5Sdecode(),
       the number of elements in the decoded dataspace is not the same as
-      what is encoded.  This problem exists for H5S_SEL_HYPER and 
+      what is encoded.  This problem exists for H5S_SEL_HYPER and
       H5S_SEL_POINTS encoding.
 
-      The cause of the problem is because the library uses 32 bits to 
+      The cause of the problem is because the library uses 32 bits to
       encode counts and block offsets for the selection.
       The solution is to use the original 32 bit encodings if possible,
       but use a different way to encode selection > 32 bits when needed.
diff --git a/src/H5Fquery.c b/src/H5Fquery.c
index b7fa4f0534..235a26d5a5 100644
--- a/src/H5Fquery.c
+++ b/src/H5Fquery.c
@@ -686,16 +686,12 @@ H5F_gc_ref(const H5F_t *f)
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5F_use_latest_flags
+ * Function: H5F_use_latest_flags
  *
- * Purpose:	    Retrieve the requested 'latest version support' for the file.
+ * Purpose:  Retrieve the requested 'latest version support' for the file.
  *
- * Return:	    Success:	Non-negative, the requested 'version support'
- *              Failure:	(can't happen)
- *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Mar  5 2007
+ * Return:   Success:    Non-negative, the requested 'version support'
+ *           Failure:    (can't happen)
  *-------------------------------------------------------------------------
  */
 unsigned
diff --git a/test/vds.c b/test/vds.c
index 7d55c3754c..a8826982f4 100644
--- a/test/vds.c
+++ b/test/vds.c
@@ -618,7 +618,7 @@ test_api(test_api_config_t config, hid_t fapl)
         TEST_ERROR
 
     /* Get examination DCPL */
-    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)174) < 0)
+    if(test_api_get_ex_dcpl(config, fapl, dcpl, &ex_dcpl, vspace[0], filename, (hsize_t)213) < 0)
         TEST_ERROR
 
     /* Test H5Pget_virtual_count */