Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into feature/vfd_swmr

Conflicts:
	src/H5AC.c
	src/H5F.c
	src/H5Pfapl.c
Resolve conflicts for H5AC.c, H5F.c and H5Pfapl.c

1 files changed, 9 insertions, 8 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index e6b1928..16bd30a 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -2620,7 +2620,7 @@ done:
  *
  * Purpose:     Sets the metadata tag property in the provided property list.
  * 
- * Return:      SUCCEED on success, FAIL otherwise.
+ * Return:      void
  *
  * Programmer:  Mike McGreevy
  *              December 1, 2009
@@ -2924,16 +2924,15 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:       H5AC_set_ring
+ * Function:    H5AC_set_ring
  *
- * Purpose:        Routine to set the ring on a DXPL (for passing through
- *                 to the metadata cache).
+ * Purpose:     Routine to set the ring on a DXPL (for passing through
+ *              to the metadata cache).
  *
- * Return:	   Success:	Non-negative
- *		   Failure:	Negative
+ * Return:      void
  *
- * Programmer:     Quincey Koziol
- *                 Tuesday, September 8, 2015
+ * Programmer:  Quincey Koziol
+ *              Tuesday, September 8, 2015
  *
  *-------------------------------------------------------------------------
  */
@@ -2942,6 +2941,8 @@ H5AC_set_ring(H5AC_ring_t ring, H5AC_ring_t *orig_ring)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
+    /* Note: orig_ring can be NULL so don't check it with HDassert() */
+
     /* Get the current ring value and return that (if orig_ring is NOT null) */
     if(orig_ring)
         *orig_ring = H5CX_get_ring();