Merge branch 'hdf5_1_10' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into dset_ohdr_minimize_105

1 files changed, 8 insertions, 274 deletions

diff --git a/src/H5Oint.c b/src/H5Oint.c
index a300697..38d73c0 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.c
@@ -644,49 +644,10 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O__open_name
- *
- * Purpose:     Internal routine to open an object 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
- *
- * Programmer:	Quincey Koziol
- *		December 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-hid_t
-H5O__open_name(const H5G_loc_t *loc, const char *name)
-{
-    hid_t ret_value = H5I_INVALID_HID;	/* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(loc);
-    HDassert(name);
-
-    /* Open the object */
-    if((ret_value = H5O_open_name(loc, name, TRUE)) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open object")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__open_name() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    H5O__open_by_idx
  *
  * Purpose:     Internal routine to open an object by index within 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
  *
@@ -705,7 +666,7 @@ H5O__open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type,
     hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
     hid_t ret_value = H5I_INVALID_HID;	/* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -730,7 +691,7 @@ done:
         if(H5G_loc_free(&obj_loc) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, H5I_INVALID_HID, "can't free location")
 
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__open_by_idx() */
 
 
@@ -739,9 +700,6 @@ done:
  *
  * Purpose:     Internal routine to open an object by its address
  *
- * 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
  *
@@ -758,7 +716,7 @@ H5O__open_by_addr(const H5G_loc_t *loc, haddr_t addr)
     H5O_loc_t   obj_oloc;            	/* Opened object object location */
     hid_t ret_value = H5I_INVALID_HID;	/* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -776,7 +734,7 @@ H5O__open_by_addr(const H5G_loc_t *loc, haddr_t addr)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open object")
 
 done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__open_by_addr() */
 
 
@@ -818,44 +776,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O__create_link
- *
- * Purpose:     Internal routine to create a link from a group to an object
- *
- * 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 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5O__create_link(const H5G_loc_t *new_loc, const char *new_name,
-    H5G_loc_t *obj_loc, hid_t lcpl_id)
-{
-    herr_t ret_value = SUCCEED;   /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(new_loc);
-    HDassert(new_name && *new_name);
-    HDassert(obj_loc);
-
-    /* Link to the object */
-    if(H5L_link(new_loc, new_name, obj_loc, lcpl_id) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "unable to create link")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__create_link() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5O_close
  *
  * Purpose:	Closes an object header that was previously open.
@@ -1083,41 +1003,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O__link
- *
- * Purpose:     Internal routine to change the refcount for an object
- *
- * 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 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5O__link(const H5O_loc_t *oloc, int adjust)
-{
-    herr_t ret_value = SUCCEED;   /* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(oloc);
-
-    /* Change the object's refcount */
-    if(H5O_link(oloc, adjust) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__link() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5O_protect
  *
  * Purpose:	Wrapper around H5AC_protect for use during a H5O_protect->
@@ -2130,42 +2015,6 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O__exists_by_name
- *
- * Purpose:     Internal routine to check if an object exists
- *
- * 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 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-htri_t
-H5O__exists_by_name(const H5G_loc_t *loc, const char *name)
-{
-    htri_t ret_value = FAIL;	/* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(loc);
-    HDassert(name && *name);
-
-    /* Check if the object exists */
-    if((ret_value = H5G_loc_exists(loc, name)) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine if '%s' exists", name)
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__exists_by_name() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5O_get_hdr_info
  *
  * Purpose:	Retrieve the object header information for an object
@@ -2421,52 +2270,11 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O__get_info_by_name
- *
- * Purpose:     Internal routine to retrieve an object's info
- *
- * Note:        This routine is needed so that there's a non-API routine
- *              that can set up VOL / SWMR info (which need a DXPL).
- *
- * Note:        Add a parameter "fields" to indicate selection of object info.
- *
- * Return:      Success:	Non-negative
- *              Failure:	Negative
- *
- * Programmer:	Quincey Koziol
- *              December 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5O__get_info_by_name(const H5G_loc_t *loc, const char *name, H5O_info_t *oinfo, unsigned fields)
-{
-    herr_t ret_value = SUCCEED;		/* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(loc);
-    HDassert(name && *name);
-    HDassert(oinfo);
-
-    /* Retrieve the object's information */
-    if(H5G_loc_info(loc, name, oinfo/*out*/, fields) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object info")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__get_info_by_name() */
-
-
-/*-------------------------------------------------------------------------
  * Function:    H5O__get_info_by_idx
  *
  * Purpose:     Internal routine to retrieve an object's info according to
  *              an index within 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).
  *
  * Note:        Add a parameter "fields" to indicate selection of object info.
  *
@@ -2488,7 +2296,7 @@ H5O__get_info_by_idx(const H5G_loc_t *loc, const char *group_name, H5_index_t id
     hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
     herr_t ret_value = SUCCEED;		/* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -2514,85 +2322,11 @@ done:
     if(loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
 
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__get_info_by_idx() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5O__set_comment_by_name
- *
- * Purpose:     Internal routine to set an object's "comment"
- *
- * 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 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5O__set_comment_by_name(const H5G_loc_t *loc, const char *name,
-    const char *comment)
-{
-    herr_t ret_value = SUCCEED;		/* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(loc);
-    HDassert(name && *name);
-
-    /* (Re)set the object's comment */
-    if(H5G_loc_set_comment(loc, name, comment) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set comment for object")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__set_comment_by_name() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5O__get_comment_by_name
- *
- * Purpose:     Internal routine to retrieve an object's "comment"
- *
- * 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 28, 2017
- *
- *-------------------------------------------------------------------------
- */
-ssize_t
-H5O__get_comment_by_name(const H5G_loc_t *loc, const char *name,
-    char *comment, size_t bufsize)
-{
-    ssize_t ret_value = FAIL;		/* Return value */
-
-    FUNC_ENTER_PACKAGE_VOL
-
-    /* Check arguments */
-    HDassert(loc);
-    HDassert(name && *name);
-
-    /* Retrieve the object's comment */
-    if((ret_value = H5G_loc_get_comment(loc, name, comment/*out*/, bufsize)) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get comment for object")
-
-done:
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
-} /* end H5O__get_comment_by_name() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5O_get_create_plist
  *
  * Purpose:	Retrieve the object creation properties for an object
@@ -3029,7 +2763,7 @@ H5O__visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     hid_t       obj_id = (-1);  /* ID of object */
     herr_t      ret_value = FAIL;       /* Return value */
 
-    FUNC_ENTER_PACKAGE_VOL
+    FUNC_ENTER_PACKAGE
 
     /* Portably initialize user data struct to zeros */
     HDmemset(&udata, 0, sizeof(udata));
@@ -3117,7 +2851,7 @@ done:
     if(udata.visited)
         H5SL_destroy(udata.visited, H5O__free_visit_visited, NULL);
 
-    FUNC_LEAVE_NOAPI_VOL(ret_value)
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__visit() */