Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '9c3900d0bf05a65e59cce6dc613b38b240599d93':
  Add note to RELEASE.txt for H5Sselect_adjust.
  Add RELEASE.txt note for H5Sselect_project_interesection
  Minor tweaks noticed while going over VOL documentation.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/H5F.c b/src/H5F.c
index b395ccc..9eebaee 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -937,7 +937,7 @@ hid_t
 H5Freopen(hid_t file_id)
 {
     H5VL_object_t   *vol_obj = NULL;
-    H5F_t           *file = NULL;                   /* File struct for new file */
+    void            *file = NULL;                   /* File struct for new file */
     hid_t           ret_value = H5I_INVALID_HID;    /* Return value */
 
     FUNC_ENTER_API(H5I_INVALID_HID)
diff --git a/src/H5VLnative_dataset.c b/src/H5VLnative_dataset.c
index 676d859..399c19f 100644
--- a/src/H5VLnative_dataset.c
+++ b/src/H5VLnative_dataset.c
@@ -241,7 +241,7 @@ H5VL__native_dataset_get(void *obj, H5VL_dataset_get_t get_type,
                 break;
             }
 
-        /* H5Dget_space_statuc */
+        /* H5Dget_space_status */
         case H5VL_DATASET_GET_SPACE_STATUS:
             {
                 H5D_space_status_t *allocation = HDva_arg(arguments, H5D_space_status_t *);
diff --git a/src/H5VLnative_file.c b/src/H5VLnative_file.c
index 588d59f..fb3cb7e 100644
--- a/src/H5VLnative_file.c
+++ b/src/H5VLnative_file.c
@@ -368,14 +368,14 @@ H5VL__native_file_specific(void *obj, H5VL_file_specific_t specific_type,
                 H5I_type_t  type       = (H5I_type_t)HDva_arg(arguments, int); /* enum work-around */
                 const char *name       = HDva_arg(arguments, const char *);
                 H5F_t      *child      = HDva_arg(arguments, H5F_t *);
-                hid_t       plist_id   = HDva_arg(arguments, hid_t);
+                hid_t       fmpl_id    = HDva_arg(arguments, hid_t);
                 H5G_loc_t   loc;
 
                 if(H5G_loc_real(obj, type, &loc) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
 
                 /* Do the mount */
-                if(H5F__mount(&loc, name, child, plist_id) < 0)
+                if(H5F__mount(&loc, name, child, fmpl_id) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to mount file")
 
                 break;
@@ -403,10 +403,10 @@ H5VL__native_file_specific(void *obj, H5VL_file_specific_t specific_type,
             {
                 hid_t       fapl_id = HDva_arg(arguments, hid_t);
                 const char *name    = HDva_arg(arguments, const char *);
-                htri_t     *ret     = HDva_arg(arguments, htri_t *);
+                htri_t     *result  = HDva_arg(arguments, htri_t *);
 
                 /* Call private routine */
-                if((*ret = H5F__is_hdf5(name, fapl_id)) < 0)
+                if((*result = H5F__is_hdf5(name, fapl_id)) < 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "error in HDF5 file check")
                 break;
             }