[svn-r25482] - update is_accessible implementation to use fapl and pass it down to H5Fint.c

- move is_HDF5 inside deprecated macros in H5Fpublic.h 
- move H5ES_status_t outside of H5VLpublic.h to H5ESpublic.h
- rename public properties in H5VLpublic.h to H5VL_PROP_* to add more scoping
- no need to include private if pkg is included in H5VLnative.c
- rename plist_id to lapl_id in loc_params structs

1 files changed, 21 insertions, 21 deletions

diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 285c823..7c6feb2 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -271,7 +271,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, H5VL_GRP_LCPL_ID, &lcpl_id) < 0)
+    if(H5P_set(plist, H5VL_PROP_GRP_LCPL_ID, &lcpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for lcpl id")
 
     loc_params.type = H5VL_OBJECT_BY_SELF;
@@ -403,11 +403,11 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
         loc_params1.type = H5VL_OBJECT_BY_NAME;
         loc_params1.obj_type = H5I_get_type(cur_loc_id);
         loc_params1.loc_data.loc_by_name.name = cur_name;
-        loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+        loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
         loc_params2.type = H5VL_OBJECT_BY_NAME;
         loc_params2.loc_data.loc_by_name.name = new_name;
-        loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+        loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
         /* get the file object */
         if(NULL == (obj = (void *)H5I_object(cur_loc_id)))
@@ -417,9 +417,9 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
         /* set creation properties */
-        if(H5P_set(plist, H5VL_LINK_TARGET, &obj) < 0)
+        if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target")
-        if(H5P_set(plist, H5VL_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0)
+        if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target loc params")
 
         /* Create the link through the VOL */
@@ -434,7 +434,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
 
         loc_params.type = H5VL_OBJECT_BY_NAME;
         loc_params.loc_data.loc_by_name.name = new_name;
-        loc_params.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+        loc_params.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
         loc_params.obj_type = H5I_get_type(cur_loc_id);
 
         /* get the file object */
@@ -445,7 +445,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
         /* set creation properties */
-        if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
+        if(H5P_set(plist, H5VL_PROP_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 */
@@ -501,12 +501,12 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
         loc_params1.type = H5VL_OBJECT_BY_NAME;
         loc_params1.obj_type = H5I_get_type(cur_loc_id);
         loc_params1.loc_data.loc_by_name.name = cur_name;
-        loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+        loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
         loc_params2.type = H5VL_OBJECT_BY_NAME;
         loc_params2.obj_type = H5I_get_type(new_loc_id);
         loc_params2.loc_data.loc_by_name.name = new_name;
-        loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+        loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
         /* get the file object */
         if(NULL == (obj1 = (void *)H5I_object(cur_loc_id)))
@@ -523,9 +523,9 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
         /* set creation properties */
-        if(H5P_set(plist, H5VL_LINK_TARGET, &obj1) < 0)
+        if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj1) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
-        if(H5P_set(plist, H5VL_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0)
+        if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name")
 
         /* Create the link through the VOL */
@@ -546,7 +546,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
 
         loc_params.type = H5VL_OBJECT_BY_NAME;
         loc_params.loc_data.loc_by_name.name = new_name;
-        loc_params.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+        loc_params.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
         loc_params.obj_type = H5I_get_type(new_loc_id);
 
         /* get the file object */
@@ -557,7 +557,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
         /* set creation properties */
-        if(H5P_set(plist, H5VL_LINK_TARGET_NAME, &cur_name) < 0)
+        if(H5P_set(plist, H5VL_PROP_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 */
@@ -595,11 +595,11 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
     loc_params1.type = H5VL_OBJECT_BY_NAME;
     loc_params1.obj_type = H5I_get_type(src_loc_id);
     loc_params1.loc_data.loc_by_name.name = src_name;
-    loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+    loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
     loc_params2.type = H5VL_OBJECT_BY_NAME;
     loc_params2.loc_data.loc_by_name.name = dst_name;
-    loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+    loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
     /* get the file object */
     if(NULL == (obj = (void *)H5I_object(src_loc_id)))
@@ -643,12 +643,12 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     /* set location paramter for source object */
     loc_params1.type = H5VL_OBJECT_BY_NAME;
     loc_params1.loc_data.loc_by_name.name = src_name;
-    loc_params1.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+    loc_params1.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
     loc_params1.obj_type = H5I_get_type(src_loc_id);
     /* set location paramter for destination object */
     loc_params2.type = H5VL_OBJECT_BY_NAME;
     loc_params2.loc_data.loc_by_name.name = dst_name;
-    loc_params2.loc_data.loc_by_name.plist_id = H5P_DEFAULT;
+    loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
     loc_params2.obj_type = H5I_get_type(dst_loc_id);
 
     if(H5L_SAME_LOC != src_loc_id) {
@@ -708,7 +708,7 @@ H5Gunlink(hid_t loc_id, const char *name)
     loc_params.type = H5VL_OBJECT_BY_NAME;
     loc_params.obj_type = H5I_get_type(loc_id);
     loc_params.loc_data.loc_by_name.name = name;
-    loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT;
+    loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
 
     /* get the file object */
     if(NULL == (obj = (void *)H5I_object(loc_id)))
@@ -752,7 +752,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
     loc_params.type = H5VL_OBJECT_BY_NAME;
     loc_params.obj_type = H5I_get_type(loc_id);
     loc_params.loc_data.loc_by_name.name = name;
-    loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT;
+    loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
 
     /* get the file object */
     if(NULL == (obj = (void *)H5I_object(loc_id)))
@@ -804,7 +804,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
 
     loc_params.type = H5VL_OBJECT_BY_NAME;
     loc_params.loc_data.loc_by_name.name = name;
-    loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT;
+    loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
     loc_params.obj_type = H5I_get_type(loc_id);
 
     /* get the file object */
@@ -865,7 +865,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
 
     loc_params.type = H5VL_OBJECT_BY_NAME;
     loc_params.loc_data.loc_by_name.name = name;
-    loc_params.loc_data.loc_by_name.plist_id = H5P_LINK_ACCESS_DEFAULT;
+    loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
     loc_params.obj_type = H5I_get_type(loc_id);
 
     /* get the file object */