[svn-r12867] Description:

    Get rid of H5L API calls from within deprecated H5G API calls.

Tested on:
    Linux/32 2.6 (chicago)

1 files changed, 207 insertions, 19 deletions

diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index fc74bcf..92570d2 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -26,11 +26,59 @@
  *-------------------------------------------------------------------------
  */
 
-/* Packages needed by this file... */
+/****************/
+/* Module Setup */
+/****************/
+
+
+/***********/
+/* Headers */
+/***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Lprivate.h"         /* Links                                */
 
+
+/****************/
+/* Local Macros */
+/****************/
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
+
+static herr_t H5G_link_hard(hid_t cur_loc_id, const char *cur_name,
+    hid_t new_loc_id, const char *new_name);
+static herr_t H5G_move(hid_t src_loc_id, const char *src_name,
+    hid_t dst_loc_id, const char *dst_name);
+
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+
 
 /*-------------------------------------------------------------------------
  * Function:	H5Glink
@@ -43,18 +91,31 @@
 herr_t
 H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, const char *new_name)
 {
-    herr_t ret_value;
+    herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Glink, FAIL)
     H5TRACE4("e","iLlss",cur_loc_id,type,cur_name,new_name);
 
+    /* Check arguments */
+    if(!cur_name || !*cur_name)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
+    if(!new_name || !*new_name)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
+
     if(type == H5L_TYPE_HARD) {
-        if((ret_value = H5Lcreate_hard(cur_loc_id, cur_name, H5L_SAME_LOC, new_name, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "Couldn't create link")
+        if((ret_value = H5G_link_hard(cur_loc_id, cur_name, H5L_SAME_LOC, new_name)) < 0)
+            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't create link")
     } /* end if */
     else if(type == H5L_TYPE_SOFT) {
-        if((ret_value = H5Lcreate_soft(cur_name, cur_loc_id, new_name, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "Couldn't create link")
+        H5G_loc_t	cur_loc;                /* Group location for new link */
+
+        /* Finish checking arguments */
+        if(H5G_loc(cur_loc_id, &cur_loc) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+        /* Create the link */
+        if(H5L_create_soft(cur_name, &cur_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
     else
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Not a valid link type")
@@ -68,7 +129,7 @@ done:
  * Function:	H5Glink2
  *
  * Purpose:	Creates a link between two existing objects.  The new
- *              API to do this is H5Llink.
+ *              APIs to do this are H5Lcreate_hard and H5Lcreate_soft.
  *
  *-------------------------------------------------------------------------
  */
@@ -76,26 +137,39 @@ herr_t
 H5Glink2(hid_t cur_loc_id, const char *cur_name, H5L_type_t type,
     hid_t new_loc_id, const char *new_name)
 {
-    herr_t ret_value;
+    herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(H5Glink2, FAIL)
     H5TRACE5("e","isLlis",cur_loc_id,cur_name,type,new_loc_id,new_name);
 
+    /* Check arguments */
+    if(!cur_name || !*cur_name)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
+    if(!new_name || !*new_name)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified")
+
     if(type == H5L_TYPE_HARD) {
-        if((ret_value = H5Lcreate_hard(cur_loc_id, cur_name, new_loc_id, new_name, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "Couldn't create link")
+        if((ret_value = H5G_link_hard(cur_loc_id, cur_name, new_loc_id, new_name)) < 0)
+            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't create link")
     } /* end if */
     else if(type == H5L_TYPE_SOFT) {
+        H5G_loc_t	new_loc;                /* Group location for new link */
+
         /* Soft links only need one location, the new_loc_id, but it's possible that
          * new_loc_id is H5L_SAME_LOC */
         if(new_loc_id == H5L_SAME_LOC)
             new_loc_id = cur_loc_id;
 
-        if((ret_value = H5Lcreate_soft(cur_name, new_loc_id, new_name, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "Couldn't create link")
+        /* Finish checking arguments */
+        if(H5G_loc(new_loc_id, &new_loc) < 0)
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+        /* Create the link */
+        if(H5L_create_soft(cur_name, &new_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+            HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
     else
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Not a valid link type")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid link type")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -103,6 +177,60 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5G_link_hard
+ *
+ * Purpose:	Creates a hard link from NEW_NAME to CUR_NAME.
+ *
+ *		CUR_NAME must name an existing object.  CUR_NAME and
+ *              NEW_NAME are interpreted relative to CUR_LOC_ID and
+ *              NEW_LOC_ID, which are either file IDs or group IDs.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, November  6, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id,
+    const char *new_name)
+{
+    H5G_loc_t	cur_loc, *cur_loc_p;    /* Information about current link's group */
+    H5G_loc_t	new_loc, *new_loc_p;    /* Information about new link's group */
+    herr_t      ret_value = SUCCEED;       /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5G_link_hard)
+
+    /* Finish checking arguments */
+    if(cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not be both H5L_SAME_LOC")
+    if(cur_loc_id != H5L_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
+	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if(new_loc_id != H5L_SAME_LOC && H5G_loc(new_loc_id, &new_loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+    /* Set up current & new location pointers */
+    cur_loc_p = &cur_loc;
+    new_loc_p = &new_loc;
+    if(cur_loc_id == H5L_SAME_LOC)
+        cur_loc_p = new_loc_p;
+    else if(new_loc_id == H5L_SAME_LOC)
+   	new_loc_p = cur_loc_p;
+    else if(cur_loc_p->oloc->file != new_loc_p->oloc->file)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should be in the same file.")
+
+    /* Create the link */
+    if(H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name,
+                H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
+	HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_link_hard() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5Gmove
  *
  * Purpose:	Moves and renames a link.  The new API to do this is H5Lmove.
@@ -112,13 +240,14 @@ done:
 herr_t
 H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
 {
-    herr_t ret_value;
+    herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Gmove, FAIL)
     H5TRACE3("e","iss",src_loc_id,src_name,dst_name);
 
-    if((ret_value = H5Lmove(src_loc_id, src_name, H5L_SAME_LOC, dst_name, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-      HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "Couldn't move link")
+    /* Call common routine to move the link */
+    if(H5G_move(src_loc_id, src_name, H5L_SAME_LOC, dst_name) < 0)
+      HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -133,14 +262,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name)
+H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
+    const char *dst_name)
 {
-    herr_t ret_value;
+    herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_API(H5Gmove2, FAIL)
     H5TRACE4("e","isis",src_loc_id,src_name,dst_loc_id,dst_name);
 
-    if((ret_value = H5Lmove(src_loc_id, src_name, dst_loc_id, dst_name, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    /* Call common routine to move the link */
+    if(H5G_move(src_loc_id, src_name, dst_loc_id, dst_name) < 0)
       HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link")
 
 done:
@@ -149,6 +280,63 @@ done:
 
 
 /*-------------------------------------------------------------------------
+ * Function:	H5G_move
+ *
+ * Purpose:	Renames an object within an HDF5 file and moves it to a new
+ *              group.  The original name SRC is unlinked from the group graph
+ *              and then inserted with the new name DST (which can specify a
+ *              new path for the object) as an atomic operation. The names
+ *              are interpreted relative to SRC_LOC_ID and
+ *              DST_LOC_ID, which are either file IDs or group ID.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, November  6, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
+    const char *dst_name)
+{
+    H5G_loc_t	src_loc, *src_loc_p;    /* Group info for source location */
+    H5G_loc_t	dst_loc, *dst_loc_p;    /* Group info for destination location */
+    herr_t      ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5G_move)
+
+    /* Check arguments */
+    if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "source and destination should not both be H5L_SAME_LOC")
+    if(src_loc_id != H5L_SAME_LOC && H5G_loc(src_loc_id, &src_loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if(dst_loc_id != H5L_SAME_LOC && H5G_loc(dst_loc_id, &dst_loc) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+    if(!src_name || !*src_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no current name specified")
+    if(!dst_name || !*dst_name)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no destination name specified")
+
+    /* Set up src & dst location pointers */
+    src_loc_p = &src_loc;
+    dst_loc_p = &dst_loc;
+    if(src_loc_id == H5L_SAME_LOC)
+        src_loc_p = dst_loc_p;
+    else if(dst_loc_id == H5L_SAME_LOC)
+        dst_loc_p = src_loc_p;
+
+    /* Move the link */
+    if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, H5P_DEFAULT,
+            H5P_DEFAULT, H5AC_dxpl_id) < 0)
+	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_move() */
+
+
+/*-------------------------------------------------------------------------
  * Function:	H5Gunlink
  *
  * Purpose:	Removes a link.  The new API is H5Ldelete.