[svn-r12869] Description:

    Rename new H5Gcopy() routine to H5Ocopy() as discussed in last Friday's
design discussion.

Tested on:
    Linux/32 2.6 (chicago)

1 files changed, 13 insertions, 13 deletions

diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index b080fb1..339dc21 100755
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -44,8 +44,8 @@
 
 /* ========= Object Copy properties ============ */
 /* Definitions for copy options */
-#define H5G_CPY_OPTION_SIZE			sizeof(unsigned)
-#define H5G_CPY_OPTION_DEF			0
+#define H5O_CPY_OPTION_SIZE			sizeof(unsigned)
+#define H5O_CPY_OPTION_DEF			0
 
 
 /******************/
@@ -111,13 +111,13 @@ const H5P_libclass_t H5P_CLS_OCPY[1] = {{
 herr_t
 H5P_ocpy_reg_prop(H5P_genclass_t *pclass)
 {
-    unsigned ocpy_option = H5G_CPY_OPTION_DEF;  /* Default object copy flags */
+    unsigned ocpy_option = H5O_CPY_OPTION_DEF;  /* Default object copy flags */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(H5P_ocpy_reg_prop, FAIL)
 
     /* Register copy options property */
-    if(H5P_register(pclass, H5G_CPY_OPTION_NAME, H5G_CPY_OPTION_SIZE,
+    if(H5P_register(pclass, H5O_CPY_OPTION_NAME, H5O_CPY_OPTION_SIZE,
              &ocpy_option, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
@@ -135,11 +135,11 @@ done:
  * Usage:       H5Pset_copy_group(plist_id, cpy_option)
  *              hid_t plist_id;			IN: Property list to copy object
  *              unsigned cpy_option; 		IN: Options to copy object such as
- *                  H5G_COPY_SHALLOW_HIERARCHY_FLAG    -- Copy only immediate members
- *                  H5G_COPY_EXPAND_SOFT_LINK_FLAG     -- Expand soft links into new objects/
- *                  H5G_COPY_EXPAND_EXT_LINK_FLAG      -- Expand external links into new objects
- *                  H5G_COPY_EXPAND_REFERENCE_FLAG -- Copy objects that are pointed by references
- *                  H5G_COPY_WITHOUT_ATTR_FLAG         -- Copy object without copying attributes
+ *                  H5O_COPY_SHALLOW_HIERARCHY_FLAG    -- Copy only immediate members
+ *                  H5O_COPY_EXPAND_SOFT_LINK_FLAG     -- Expand soft links into new objects/
+ *                  H5O_COPY_EXPAND_EXT_LINK_FLAG      -- Expand external links into new objects
+ *                  H5O_COPY_EXPAND_REFERENCE_FLAG -- Copy objects that are pointed by references
+ *                  H5O_COPY_WITHOUT_ATTR_FLAG         -- Copy object without copying attributes
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -157,7 +157,7 @@ H5Pset_copy_object(hid_t plist_id, unsigned cpy_option)
     H5TRACE2("e","iIu",plist_id,cpy_option);
 
     /* Check parameters */
-    if(cpy_option & ~H5G_COPY_ALL)
+    if(cpy_option & ~H5O_COPY_ALL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unknown option specified")
 
     /* Get the plist structure */
@@ -165,7 +165,7 @@ H5Pset_copy_object(hid_t plist_id, unsigned cpy_option)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Set value */
-    if(H5P_set(plist, H5G_CPY_OPTION_NAME, &cpy_option) < 0)
+    if(H5P_set(plist, H5O_CPY_OPTION_NAME, &cpy_option) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set copy object flag")
 
 done:
@@ -176,7 +176,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_copy_object
  *
- * Purpose:     Returns the cpy_option, which is set for H5Gcopy(hid_t loc_id,
+ * Purpose:     Returns the cpy_option, which is set for H5Ocopy(hid_t loc_id,
  *              const char* name, ... ) for copying objects
  *
  * Return:      Non-negative on success/Negative on failure
@@ -200,7 +200,7 @@ H5Pget_copy_object(hid_t plist_id, unsigned *cpy_option /*out*/)
 
     /* Get values */
     if(cpy_option)
-        if(H5P_get(plist, H5G_CPY_OPTION_NAME, cpy_option) < 0)
+        if(H5P_get(plist, H5O_CPY_OPTION_NAME, cpy_option) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get object copy flag")
 
 done: