[svn-r22417] rename the properties used for the VOL callbacks.

move them to the VOL public header.

20 files changed, 84 insertions, 78 deletions

diff --git a/src/H5A.c b/src/H5A.c
index a3f85ab..ca35078 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -239,11 +239,11 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5A_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_set(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id")
-    if(H5P_set(plist, H5A_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_set(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id")
-    if(H5P_set(plist, H5A_CRT_LOCATION_NAME, &location) < 0)
+    if(H5P_set(plist, H5VL_ATTR_LOCATION, &location) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for location")
 
     /* Create the attribute through the VOL */
@@ -321,11 +321,11 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5A_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_set(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id")
-    if(H5P_set(plist, H5A_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_set(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id")
-    if(H5P_set(plist, H5A_CRT_LOCATION_NAME, &location) < 0)
+    if(H5P_set(plist, H5VL_ATTR_LOCATION, &location) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for location")
 
     /* Create the attribute through the VOL */
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index f4283f1..50f2cf1 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -161,11 +161,11 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5A_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_set(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id")
-    if(H5P_set(plist, H5A_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_set(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id")
-    if(H5P_set(plist, H5A_CRT_LOCATION_NAME, &location) < 0)
+    if(H5P_set(plist, H5VL_ATTR_LOCATION, &location) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for location")
 
     /* Create the attribute through the VOL */
diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h
index ac9f698..448ece5 100644
--- a/src/H5Aprivate.h
+++ b/src/H5Aprivate.h
@@ -31,10 +31,6 @@
 /**************************/
 /* Library Private Macros */
 /**************************/
-/* ========  Attribute creation property names ======== */
-#define H5A_CRT_TYPE_ID_NAME        "attr_type_id"
-#define H5A_CRT_SPACE_ID_NAME       "attr_space_id"
-#define H5A_CRT_LOCATION_NAME       "attr_location"
 
 /****************************/
 /* Library Private Typedefs */
diff --git a/src/H5D.c b/src/H5D.c
index fe5522d..22c020f 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -161,11 +161,11 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5D_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id")
-    if(H5P_set(plist, H5D_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id")
-    if(H5P_set(plist, H5D_CRT_LCPL_ID_NAME, &lcpl_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id")
 
     /* Create the dataset through the VOL */
@@ -242,9 +242,9 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5D_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id")
-    if(H5P_set(plist, H5D_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id")
 
     /* Create the dataset through the VOL */
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index 23d9423..f03b914 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -159,11 +159,11 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5D_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for datatype id")
-    if(H5P_set(plist, H5D_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for space id")
-    if(H5P_set(plist, H5D_CRT_LCPL_ID_NAME, &lcpl_id) < 0)
+    if(H5P_set(plist, H5VL_DSET_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id")
 
     /* Create the dataset through the VOL */
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index fca1bd8..bee87fa 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -47,9 +47,6 @@
 #define H5D_CRT_FILL_VALUE_NAME    "fill_value"         /* Fill value */
 #define H5D_CRT_ALLOC_TIME_STATE_NAME "alloc_time_state" /* Space allocation time state */
 #define H5D_CRT_EXT_FILE_LIST_NAME "efl"                /* External file list */
-#define H5D_CRT_TYPE_ID_NAME        "dataset_type_id"            /* datatype id */
-#define H5D_CRT_SPACE_ID_NAME       "dataset_space_id"           /* dataspace id */
-#define H5D_CRT_LCPL_ID_NAME        "dataset_lcpl_id"            /* lcpl id */
 
 /* ========  Dataset access property names ======== */
 #define H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME   "rdcc_nslots"   /* Size of raw data chunk cache(slots) */
diff --git a/src/H5G.c b/src/H5G.c
index 9e72382..00e142a 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -298,7 +298,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t g
     if(NULL == (plist = (H5P_genplist_t *)H5I_object(gcpl_id)))
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-    if(H5P_set(plist, H5G_CRT_LCPL_ID_NAME, &lcpl_id) < 0)
+    if(H5P_set(plist, H5VL_GRP_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for lcpl id")
 
     /* Create the group through the VOL */
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 2b3a9e6..4a2cf28 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -247,7 +247,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* get creation properties */
-    if(H5P_set(plist, H5G_CRT_LCPL_ID_NAME, &lcpl_id) < 0)
+    if(H5P_set(plist, H5VL_GRP_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id")
 
     /* Create the group through the VOL */
@@ -331,9 +331,9 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
 
     if(type == H5L_TYPE_HARD) {
         /* set creation properties */
-        if(H5P_set(plist, H5L_CRT_TARGET_ID_NAME, &cur_loc_id) < 0)
+        if(H5P_set(plist, H5VL_LINK_TARGET_ID, &cur_loc_id) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
-        if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &cur_name) < 0)
+        if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name")
 
         /* Create the link through the VOL */
@@ -343,7 +343,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
     } /* end if */
     else if(type == H5L_TYPE_SOFT) {
         /* set creation properties */
-        if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &cur_name) < 0)
+        if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name")
 
         /* Create the link through the VOL */
@@ -390,9 +390,9 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
 
     if(type == H5L_TYPE_HARD) {
         /* set creation properties */
-        if(H5P_set(plist, H5L_CRT_TARGET_ID_NAME, &cur_loc_id) < 0)
+        if(H5P_set(plist, H5VL_LINK_TARGET_ID, &cur_loc_id) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
-        if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &cur_name) < 0)
+        if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name")
 
         /* Create the link through the VOL */
@@ -407,7 +407,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
             new_loc_id = cur_loc_id;
 
         /* set creation properties */
-        if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &cur_name) < 0)
+        if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name")
 
         /* Create the link through the VOL */
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 680f2c5..cacd947 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -98,8 +98,6 @@
                                                     H5G_CRT_GINFO_EST_NAME_LEN \
                                                 }
 
-#define H5G_CRT_LCPL_ID_NAME "group_lcpl_id"
-
 /* If the module using this macro is allowed access to the private variables, access them directly */
 #ifdef H5G_PACKAGE
 #define H5G_MOUNTED(G)              ((G)->shared->mounted)
diff --git a/src/H5L.c b/src/H5L.c
index 3f48431..349d8af 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -429,7 +429,7 @@ H5Lcreate_soft(const char *link_target,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &link_target) < 0)
+    if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &link_target) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name")
 
     /* Create the link through the VOL */
@@ -488,9 +488,9 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5L_CRT_TARGET_ID_NAME, &cur_loc_id) < 0)
+    if(H5P_set(plist, H5VL_LINK_TARGET_ID, &cur_loc_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
-    if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &cur_name) < 0)
+    if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name")
 
     /* Create the link through the VOL */
@@ -553,11 +553,11 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5L_CRT_LINK_TYPE_NAME, &link_type) < 0)
+    if(H5P_set(plist, H5VL_LINK_TYPE, &link_type) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist")
-    if(H5P_set(plist, H5L_CRT_UDATA_NAME, &udata) < 0)
+    if(H5P_set(plist, H5VL_LINK_UDATA, &udata) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist")
-    if(H5P_set(plist, H5L_CRT_UDATA_SIZE_NAME, &udata_size) < 0)
+    if(H5P_set(plist, H5VL_LINK_UDATA_SIZE, &udata_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist")
 
     /* Create the link through the VOL */
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 03fd174..c6562b3 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -587,11 +587,11 @@ H5Lcreate_external(const char *file_name, const char *obj_name,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5L_CRT_LINK_TYPE_NAME, &link_type) < 0)
+    if(H5P_set(plist, H5VL_LINK_TYPE, &link_type) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist")
-    if(H5P_set(plist, H5L_CRT_UDATA_NAME, &ext_link_buf) < 0)
+    if(H5P_set(plist, H5VL_LINK_UDATA, &ext_link_buf) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist")
-    if(H5P_set(plist, H5L_CRT_UDATA_SIZE_NAME, &buf_size) < 0)
+    if(H5P_set(plist, H5VL_LINK_UDATA_SIZE, &buf_size) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value from plist")
 
     /* Create the link through the VOL */
diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h
index e725378..8e4120e 100644
--- a/src/H5Lprivate.h
+++ b/src/H5Lprivate.h
@@ -37,11 +37,6 @@
 
 /* ========  Link creation property names ======== */
 #define H5L_CRT_INTERMEDIATE_GROUP_NAME         "intermediate_group" /* Create intermediate groups flag */
-#define H5L_CRT_TARGET_ID_NAME                  "target location id"
-#define H5L_CRT_TARGET_NAME_NAME                "target name"
-#define H5L_CRT_LINK_TYPE_NAME                  "link type"
-#define H5L_CRT_UDATA_NAME                      "udata"
-#define H5L_CRT_UDATA_SIZE_NAME                 "udata size"
 
 /* ========  Link access property names ======== */
 #define H5L_ACS_NLINKS_NAME        "max soft links"         /* Number of soft links to traverse */
diff --git a/src/H5O.c b/src/H5O.c
index 4062c3e..8bf524d 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -441,9 +441,9 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* set creation properties */
-    if(H5P_set(plist, H5L_CRT_TARGET_ID_NAME, &obj_id) < 0)
+    if(H5P_set(plist, H5VL_LINK_TARGET_ID, &obj_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
-    if(H5P_set(plist, H5L_CRT_TARGET_NAME_NAME, &name) < 0)
+    if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &name) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
 
     /* Create the link through the VOL */
diff --git a/src/H5Pacpl.c b/src/H5Pacpl.c
index bd4a758..04ab1b9 100644
--- a/src/H5Pacpl.c
+++ b/src/H5Pacpl.c
@@ -111,17 +111,17 @@ H5P_acrt_reg_prop(H5P_genclass_t *pclass)
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Register the type ID property*/
-    if(H5P_register_real(pclass, H5A_CRT_TYPE_ID_NAME, sizeof(hid_t), &type_id, 
+    if(H5P_register_real(pclass, H5VL_ATTR_TYPE_ID, sizeof(hid_t), &type_id, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the space ID property */
-    if(H5P_register_real(pclass, H5A_CRT_SPACE_ID_NAME, sizeof(hid_t), &space_id, 
+    if(H5P_register_real(pclass, H5VL_ATTR_SPACE_ID, sizeof(hid_t), &space_id, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the lcpl ID property */
-    if(H5P_register_real(pclass, H5A_CRT_LOCATION_NAME, H5A_CRT_LOCATION_SIZE, &location, 
+    if(H5P_register_real(pclass, H5VL_ATTR_LOCATION, H5A_CRT_LOCATION_SIZE, &location, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 0a41371..1a5a220 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -204,17 +204,17 @@ H5P_dcrt_reg_prop(H5P_genclass_t *pclass)
        HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the type ID property*/
-    if(H5P_register_real(pclass, H5D_CRT_TYPE_ID_NAME, sizeof(hid_t), &type_id, 
+    if(H5P_register_real(pclass, H5VL_DSET_TYPE_ID, sizeof(hid_t), &type_id, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the space ID property */
-    if(H5P_register_real(pclass, H5D_CRT_SPACE_ID_NAME, sizeof(hid_t), &space_id, 
+    if(H5P_register_real(pclass, H5VL_DSET_SPACE_ID, sizeof(hid_t), &space_id, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the lcpl ID property */
-    if(H5P_register_real(pclass, H5D_CRT_LCPL_ID_NAME, sizeof(hid_t), &lcpl_id, 
+    if(H5P_register_real(pclass, H5VL_DSET_LCPL_ID, sizeof(hid_t), &lcpl_id, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index eb35a6d..4947029 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -122,7 +122,7 @@ H5P_gcrt_reg_prop(H5P_genclass_t *pclass)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
     /* Register the lcpl ID property */
-    if(H5P_register_real(pclass, H5G_CRT_LCPL_ID_NAME, sizeof(hid_t), &lcpl_id, 
+    if(H5P_register_real(pclass, H5VL_GRP_LCPL_ID, sizeof(hid_t), &lcpl_id, 
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c
index ae701f2..4c22749 100644
--- a/src/H5Plcpl.c
+++ b/src/H5Plcpl.c
@@ -146,23 +146,23 @@ H5P_lcrt_reg_prop(H5P_genclass_t *pclass)
     if(H5P_register_real(pclass, H5L_CRT_INTERMEDIATE_GROUP_NAME, H5L_CRT_INTERMEDIATE_GROUP_SIZE, &intmd_group, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
          HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    if(H5P_register_real(pclass, H5L_CRT_TARGET_ID_NAME, H5L_CRT_TARGET_ID_SIZE, &target_id,
+    if(H5P_register_real(pclass, H5VL_LINK_TARGET_ID, H5L_CRT_TARGET_ID_SIZE, &target_id,
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    if(H5P_register_real(pclass, H5L_CRT_TARGET_NAME_NAME, H5L_CRT_TARGET_NAME_SIZE, &target_name,
+    if(H5P_register_real(pclass, H5VL_LINK_TARGET_NAME, H5L_CRT_TARGET_NAME_SIZE, &target_name,
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    if(H5P_register_real(pclass, H5L_CRT_LINK_TYPE_NAME, H5L_CRT_LINK_TYPE_SIZE, &link_type,
+    if(H5P_register_real(pclass, H5VL_LINK_TYPE, H5L_CRT_LINK_TYPE_SIZE, &link_type,
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    if(H5P_register_real(pclass, H5L_CRT_UDATA_NAME, H5L_CRT_UDATA_SIZE, &udata,
+    if(H5P_register_real(pclass, H5VL_LINK_UDATA, H5L_CRT_UDATA_SIZE, &udata,
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
-    if(H5P_register_real(pclass, H5L_CRT_UDATA_SIZE_NAME, H5L_CRT_UDATA_SIZE_SIZE, &udata_size,
+    if(H5P_register_real(pclass, H5VL_LINK_UDATA_SIZE, H5L_CRT_UDATA_SIZE_SIZE, &udata_size,
                          NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class")
 
diff --git a/src/H5VL.c b/src/H5VL.c
index 24821aa..d4b1961 100644
--- a/src/H5VL.c
+++ b/src/H5VL.c
@@ -1702,7 +1702,7 @@ H5VL_link_create(H5VL_link_create_type_t create_type, hid_t id, const char *new_
         if(NULL == (plist = (H5P_genplist_t *)H5I_object(lcpl_id)))
             HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
-        if(H5P_get(plist, H5L_CRT_TARGET_ID_NAME, &cur_id) < 0)
+        if(H5P_get(plist, H5VL_LINK_TARGET_ID, &cur_id) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for current location id")
 
         if (NULL == (vol_plugin = (H5VL_class_t *)H5I_get_aux(cur_id)))
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index b99296e..8e3b271 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -316,11 +316,11 @@ H5VL_native_attr_create(hid_t loc_id, const char *attr_name, hid_t acpl_id, hid_
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* get creation properties */
-    if(H5P_get(plist, H5A_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_get(plist, H5VL_ATTR_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for datatype id")
-    if(H5P_get(plist, H5A_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_get(plist, H5VL_ATTR_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for space id")
-    if(H5P_get(plist, H5A_CRT_LOCATION_NAME, &location) < 0)
+    if(H5P_get(plist, H5VL_ATTR_LOCATION, &location) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id")
 
     if(H5G_loc(loc_id, &loc) < 0)
@@ -852,11 +852,11 @@ H5VL_native_dataset_create(hid_t loc_id, const char *name, hid_t dcpl_id, hid_t
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* get creation properties */
-    if(H5P_get(plist, H5D_CRT_TYPE_ID_NAME, &type_id) < 0)
+    if(H5P_get(plist, H5VL_DSET_TYPE_ID, &type_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for datatype id")
-    if(H5P_get(plist, H5D_CRT_SPACE_ID_NAME, &space_id) < 0)
+    if(H5P_get(plist, H5VL_DSET_SPACE_ID, &space_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for space id")
-    if(H5P_get(plist, H5D_CRT_LCPL_ID_NAME, &lcpl_id) < 0)
+    if(H5P_get(plist, H5VL_DSET_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id")
 
     /* Check arguments */
@@ -1960,7 +1960,7 @@ H5VL_native_group_create(hid_t loc_id, const char *name, hid_t gcpl_id, hid_t ga
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* get creation properties */
-    if(H5P_get(plist, H5G_CRT_LCPL_ID_NAME, &lcpl_id) < 0)
+    if(H5P_get(plist, H5VL_GRP_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id")
 
     if(H5G_loc(loc_id, &loc) < 0)
@@ -2192,9 +2192,9 @@ H5VL_native_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, const
                 hid_t        cur_loc_id;
                 char         *cur_name = NULL;
 
-                if(H5P_get(plist, H5L_CRT_TARGET_ID_NAME, &cur_loc_id) < 0)
+                if(H5P_get(plist, H5VL_LINK_TARGET_ID, &cur_loc_id) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for current location id")
-                if(H5P_get(plist, H5L_CRT_TARGET_NAME_NAME, &cur_name) < 0)
+                if(H5P_get(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for current name")
 
                 if(cur_loc_id != H5L_SAME_LOC && H5G_loc(cur_loc_id, &cur_loc) < 0)
@@ -2236,7 +2236,7 @@ H5VL_native_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, const
                 if(H5G_loc(loc_id, &link_loc) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
-                if(H5P_get(plist, H5L_CRT_TARGET_NAME_NAME, &target_name) < 0)
+                if(H5P_get(plist, H5VL_LINK_TARGET_NAME, &target_name) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for targe name")
 
                 /* Create the link */
@@ -2255,11 +2255,11 @@ H5VL_native_link_create(H5VL_link_create_type_t create_type, hid_t loc_id, const
                 if(H5G_loc(loc_id, &link_loc) < 0)
                     HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
-                if(H5P_get(plist, H5L_CRT_LINK_TYPE_NAME, &link_type) < 0)
+                if(H5P_get(plist, H5VL_LINK_TYPE, &link_type) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for link type")
-                if(H5P_get(plist, H5L_CRT_UDATA_NAME, &udata) < 0)
+                if(H5P_get(plist, H5VL_LINK_UDATA, &udata) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for udata")
-                if(H5P_get(plist, H5L_CRT_UDATA_SIZE_NAME, &udata_size) < 0)
+                if(H5P_get(plist, H5VL_LINK_UDATA_SIZE, &udata_size) < 0)
                     HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for udata size")
 
                 /* Create link */
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index 0f15c83..0aa5ca9 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -26,6 +26,26 @@
 #include "H5Fpublic.h"
 #include "H5Lpublic.h"
 
+/* Dataset creation property names */
+#define H5VL_DSET_TYPE_ID        "dataset_type_id"
+#define H5VL_DSET_SPACE_ID       "dataset_space_id"
+#define H5VL_DSET_LCPL_ID        "dataset_lcpl_id"
+
+/* Attribute creation property names */
+#define H5VL_ATTR_TYPE_ID        "attr_type_id"
+#define H5VL_ATTR_SPACE_ID       "attr_space_id"
+#define H5VL_ATTR_LOCATION       "attr_location"
+
+/* Link creation property names */
+#define H5VL_LINK_TARGET_ID      "target location id"
+#define H5VL_LINK_TARGET_NAME    "target name"
+#define H5VL_LINK_TYPE           "link type"
+#define H5VL_LINK_UDATA          "udata"
+#define H5VL_LINK_UDATA_SIZE     "udata size"
+
+/* Group creation property names */
+#define H5VL_GRP_LCPL_ID "group_lcpl_id"
+
 /* types for all attr get API routines */
 typedef enum H5VL_attr_get_t {
     H5VL_ATTR_EXISTS              = 0,         /* H5Aexists                          */
@@ -142,7 +162,7 @@ typedef struct H5VL_attr_class_t {
     hid_t  (*open)  (hid_t loc_id, void *location, const char *attr_name, hid_t aapl_id, hid_t req);
     herr_t (*read)  (hid_t attr_id, hid_t mem_type_id, void *buf, hid_t req);
     herr_t (*write) (hid_t attr_id, hid_t mem_type_id, const void *buf, hid_t req);
-    herr_t (*get)   (hid_t file_id, H5VL_attr_get_t get_type, hid_t req, va_list arguments);
+    herr_t (*get)   (hid_t loc_id, H5VL_attr_get_t get_type, hid_t req, va_list arguments);
     herr_t (*remove)(hid_t loc_id, void *location, const char *attr_name, hid_t req);
     herr_t (*close) (hid_t attr_id, hid_t req);
 } H5VL_attr_class_t;
@@ -163,7 +183,7 @@ typedef struct H5VL_dataset_class_t {
                      hid_t xfer_plist_id, void * buf, hid_t req);
     herr_t (*write) (hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
                      hid_t xfer_plist_id, const void * buf, hid_t req);
-    herr_t (*set_extent) (hid_t uid, const hsize_t size[], hid_t req);
+    herr_t (*set_extent) (hid_t loc_id, const hsize_t size[], hid_t req);
     herr_t (*get)   (hid_t file_id, H5VL_dataset_get_t get_type, hid_t req, va_list arguments);
     herr_t (*close) (hid_t dataset_id, hid_t req);
 } H5VL_dataset_class_t;