[svn-r25505] merge from trunk and fix some bugs due to 64_bit switch.

3 files changed, 11 insertions, 8 deletions

diff --git a/src/H5O.c b/src/H5O.c
index e5439b1..3fb600c 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -612,7 +612,8 @@ H5Odecr_refcount(hid_t object_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* change the ref count through the VOL */
-    if(H5VL_object_misc(obj, loc_params, vol_plugin, H5VL_OBJECT_CHANGE_REF_COUNT, H5AC_dxpl_id, H5_EVENT_STACK_NULL, -1) < 0)
+    if(H5VL_object_misc(obj, loc_params, vol_plugin, H5VL_OBJECT_CHANGE_REF_COUNT, 
+                        H5AC_dxpl_id, H5_EVENT_STACK_NULL, -1) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed")
 
 done:
@@ -639,7 +640,7 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id)
     void    *obj = NULL;        /* object token of loc_id */
     H5VL_t  *vol_plugin;        /* VOL plugin information */
     H5VL_loc_params_t loc_params;
-    hid_t       ret_value = FAIL;       /* Return value */
+    htri_t   ret_value = FAIL;       /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("t", "i*si", loc_id, name, lapl_id);
@@ -660,13 +661,14 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id)
 
     /* get the file object */
     if(NULL == (obj = (void *)H5VL_get_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
     /* get the plugin pointer */
     if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
 
     /* change the ref count through the VOL */
-    if(H5VL_object_get(obj, loc_params, vol_plugin, H5VL_OBJECT_EXISTS, H5AC_dxpl_id, H5_EVENT_STACK_NULL, &ret_value) < 0)
+    if(H5VL_object_get(obj, loc_params, vol_plugin, H5VL_OBJECT_EXISTS, H5AC_dxpl_id, 
+                       H5_EVENT_STACK_NULL, &ret_value) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine if '%s' exists", name)
 
 done:
@@ -1255,6 +1257,7 @@ H5Oclose(hid_t object_id)
         case H5I_ATTR:
         case H5I_REFERENCE:
         case H5I_VFL:
+        case H5I_VOL:
         case H5I_GENPROP_CLS:
         case H5I_GENPROP_LST:
         case H5I_ERROR_CLASS:
diff --git a/src/H5VLnative.c b/src/H5VLnative.c
index c649650..14b6284 100644
--- a/src/H5VLnative.c
+++ b/src/H5VLnative.c
@@ -3198,7 +3198,7 @@ H5VL_native_object_copy(void *src_obj, H5VL_loc_params_t loc_params1, const char
 {
     H5G_loc_t	src_loc;                /* Source object group location */
     H5G_loc_t	dst_loc;                /* Destination group location */
-    hid_t       ret_value = FAIL;
+    herr_t      ret_value = FAIL;
     
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -3599,7 +3599,7 @@ done:
  */
 static herr_t
 H5VL_native_object_get(void *obj, H5VL_loc_params_t loc_params, H5VL_object_get_t get_type, 
-                       hid_t UNUSED dxpl_id, void UNUSED **req, va_list arguments)
+                       hid_t dxpl_id, void UNUSED **req, va_list arguments)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
     H5G_loc_t	loc;                    /* Location of group */
@@ -3618,7 +3618,7 @@ H5VL_native_object_get(void *obj, H5VL_loc_params_t loc_params, H5VL_object_get_
                 if(loc_params.type == H5VL_OBJECT_BY_NAME) {
                     /* Check if the object exists */
                     if((*ret = H5G_loc_exists(&loc, loc_params.loc_data.loc_by_name.name, 
-                                              loc_params.loc_data.loc_by_name.lapl_id, H5AC_dxpl_id)) < 0)
+                                              loc_params.loc_data.loc_by_name.lapl_id, dxpl_id)) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine if '%s' exists", 
                                     loc_params.loc_data.loc_by_name.name)
                 }
diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h
index b2d4dce..982e1fc 100644
--- a/src/H5VLpublic.h
+++ b/src/H5VLpublic.h
@@ -149,7 +149,7 @@ typedef enum H5VL_object_optional_t {
 
 /* types for all object get API routines */
 typedef enum H5VL_object_get_t {
-    H5VL_OBJECT_EXISTS,                /* H5Oexists_by_name)                */
+    H5VL_OBJECT_EXISTS,                /* H5Oexists_by_name                 */
     H5VL_OBJECT_GET_INFO,	       /* object info	                    */
     H5VL_OBJECT_GET_COMMENT,	       /* object comment            	    */
     H5VL_REF_GET_REGION,               /* dataspace of region               */