Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions

orginally intended to support the full SWMR feature (from develop).

1 files changed, 12 insertions, 201 deletions

diff --git a/src/H5Gint.c b/src/H5Gint.c
index 3b5de44..8fd7514 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -134,7 +134,7 @@ H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
     H5G_obj_create_t gcrt_info;         /* Information for group creation */
     H5G_t *ret_value = NULL;            /* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -161,48 +161,11 @@ H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
     ret_value = (H5G_t *)ocrt_info.new_obj;
 
 done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__create_named() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5G__create_anon
- *
- * Purpose:     Internal routine to create a new anonymous group.
- *
- * Note:        This routine is needed so that there's a non-API routine for
- *              creating groups that can set up VOL / SWMR info
- *              (which need a DXPL).
- *
- * Return:      Success:    Non-NULL, pointer to new group object.
- *              Failure:    NULL
- *
- * Programmer:	Quincey Koziol
- *		December 17, 2017
- *
- *-------------------------------------------------------------------------
- */
-H5G_t *
-H5G__create_anon(H5F_t *file, H5G_obj_create_t *gcrt_info)
-{
-    H5G_t       *ret_value = NULL;      /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(file);
-    HDassert(gcrt_info);
-
-    /* Create the new group & get its ID */
-    if(NULL == (ret_value = H5G__create(file, gcrt_info)))
-        HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, NULL, "unable to create group")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5G__create_anon() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5G__create
  *
  * Purpose:	Creates a new empty group with the specified name. The name
@@ -302,7 +265,7 @@ H5G__open_name(const H5G_loc_t *loc, const char *name)
     H5O_type_t  obj_type;               /* Type of object at location */
     H5G_t *ret_value = NULL;            /* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(loc);
@@ -336,7 +299,7 @@ done:
         if(loc_found && H5G_loc_free(&grp_loc) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, NULL, "can't free location")
 
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__open_name() */
 
 
@@ -502,7 +465,7 @@ H5G__close_cb(H5G_t *grp)
 {
     herr_t ret_value = SUCCEED;                 /* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(grp && grp->shared);
@@ -513,7 +476,7 @@ H5G__close_cb(H5G_t *grp)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "problem closing group")
 
 done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__close_cb() */
 
 
@@ -1239,44 +1202,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5G__get_create_plist
- *
- * Purpose:     Internal routine to retrieve a group's creation property list.
- *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Return:	Success:	ID for a copy of the group creation property
- *				list.  The property list ID should be released
- *				by calling H5Pclose().
- *
- *		Failure:	H5I_INVALID_HID
- *
- * Programmer:	Quincey Koziol
- *		December 17, 2017
- *
- *-------------------------------------------------------------------------
- */
-hid_t
-H5G__get_create_plist(const H5G_t *grp)
-{
-    hid_t ret_value = H5I_INVALID_HID;  /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(grp);
-
-    /* Retrieve the GCPL */
-    if((ret_value = H5G_get_create_plist(grp)) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5I_INVALID_HID, "can't get group's creation property list")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5G__get_create_plist() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5G_get_create_plist
  *
  * Purpose:	Private function for H5Gget_create_plist
@@ -1372,51 +1297,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5G__get_info
- *
- * Purpose:     Internal routine to retrieve the info for a group.
- *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
- *
- * Programmer:	Quincey Koziol
- *		December 18, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G__get_info(const H5G_loc_t *loc, H5G_info_t *grp_info)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(loc);
-    HDassert(grp_info);
-
-    /* Retrieve the group's information */
-    if(H5G__obj_info(loc->oloc, grp_info) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5G__get_info() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    H5G__get_info_by_name
  *
  * Purpose:     Internal routine to retrieve the info for a group, by name.
  *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		December 18, 2017
@@ -1432,7 +1317,7 @@ H5G__get_info_by_name(const H5G_loc_t *loc, const char *name, H5G_info_t *grp_in
     hbool_t     loc_found = FALSE;      /* Location at 'name' found */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -1457,7 +1342,7 @@ done:
     if(loc_found && H5G_loc_free(&grp_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__get_info_by_name() */
 
 
@@ -1466,11 +1351,7 @@ done:
  *
  * Purpose:     Internal routine to retrieve the info for a group, by index.
  *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:	Quincey Koziol
  *		December 18, 2017
@@ -1487,7 +1368,7 @@ H5G__get_info_by_idx(const H5G_loc_t *loc, const char *group_name,
     hbool_t     loc_found = FALSE;      /* Location at 'name' found */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -1512,76 +1393,6 @@ done:
     if(loc_found && H5G_loc_free(&grp_loc) < 0)
         HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't free location")
 
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G__get_info_by_idx() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5G__flush
- *
- * Purpose:     Internal routine to flushes a group to disk.
- *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Return:      Success:    Non-negative
- *              Failure:    Negative
- *
- * Programmer:  Quincey Koziol
- *              December 18, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G__flush(H5G_t *grp, hid_t group_id)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Sanity check */
-    HDassert(grp);
-
-    /* Flush metadata to file */
-    if(H5O_flush_common(&grp->oloc, group_id) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTFLUSH, FAIL, "unable to flush group and object flush callback")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* H5G__flush */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5G__refresh
- *
- * Purpose:     Internal routine to refresh a group.
- *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Return:      Success:    Non-negative
- *              Failure:    Negative
- *
- * Programmer:  Quincey Koziol
- *              December 18, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G__refresh(H5G_t *grp, hid_t group_id)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Sanity check */
-    HDassert(grp);
-
-    /* Call private function to refresh group object */
-    if((H5O_refresh_metadata(group_id, grp->oloc)) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to refresh group")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* H5G__refresh */
-