From 41c42d25f36519afdb603abf6c3ca76e39b20435 Mon Sep 17 00:00:00 2001 From: Mohamad Chaarawi Date: Mon, 21 May 2012 09:23:57 -0500 Subject: [svn-r22384] - fix type in CMake file - rename delete callback to remove --- src/CMakeLists.txt | 2 +- src/H5A.c | 4 ++-- src/H5Gdeprec.c | 2 +- src/H5L.c | 4 ++-- src/H5VL.c | 30 +++++++++++++++--------------- src/H5VLnative.c | 20 ++++++++++---------- src/H5VLprivate.h | 4 ++-- src/H5VLpublic.h | 4 ++-- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65a2458..7cc0746 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -592,7 +592,7 @@ SET (H5VL_SRCS ${HDF5_SRC_DIR}/H5VLdummy.c ${HDF5_SRC_DIR}/H5VLnative.c ) -SET (H5FD_HDRS +SET (H5VL_HDRS ${HDF5_SRC_DIR}/H5VLpublic.h ${HDF5_SRC_DIR}/H5VLpkg.h ${HDF5_SRC_DIR}/H5VLdummy.h diff --git a/src/H5A.c b/src/H5A.c index 2c361dc..930eb9a 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -2135,7 +2135,7 @@ H5Adelete(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Open the attribute through the VOL */ - if(H5VL_attr_delete(loc_id, NULL, name, H5_REQUEST_NULL) < 0) + if(H5VL_attr_remove(loc_id, NULL, name, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete attribute") done: @@ -2187,7 +2187,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to locate object") /* Open the attribute through the VOL */ - if(H5VL_attr_delete(loc_id, location, attr_name, H5_REQUEST_NULL) < 0) + if(H5VL_attr_remove(loc_id, location, attr_name, H5_REQUEST_NULL) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTDELETE, FAIL, "unable to delete attribute") done: diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 0873c37..2b3a9e6 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -604,7 +604,7 @@ H5Gunlink(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Delete the link through the VOL */ - if((ret_value = H5VL_link_delete(loc_id, name, NULL, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) + if((ret_value = H5VL_link_remove(loc_id, name, NULL, H5P_DEFAULT, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: diff --git a/src/H5L.c b/src/H5L.c index 301fe11..e0c5f9c 100644 --- a/src/H5L.c +++ b/src/H5L.c @@ -600,7 +600,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") /* Delete the link through the VOL */ - if((ret_value = H5VL_link_delete(loc_id, name, NULL, lapl_id, H5_REQUEST_NULL)) < 0) + if((ret_value = H5VL_link_remove(loc_id, name, NULL, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: @@ -657,7 +657,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, udata.dxpl_id = H5AC_dxpl_id; /* Delete the link through the VOL */ - if((ret_value = H5VL_link_delete(loc_id, group_name, &udata, lapl_id, H5_REQUEST_NULL)) < 0) + if((ret_value = H5VL_link_remove(loc_id, group_name, &udata, lapl_id, H5_REQUEST_NULL)) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link") done: diff --git a/src/H5VL.c b/src/H5VL.c index 6624d2b..bf7b1bb 100644 --- a/src/H5VL.c +++ b/src/H5VL.c @@ -811,9 +811,9 @@ done: /*------------------------------------------------------------------------- - * Function: H5VL_attr_delete + * Function: H5VL_attr_remove * - * Purpose: Deletes an attribute through the VOL + * Purpose: Removes an attribute through the VOL * * Return: Success: Non Negative * @@ -825,7 +825,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req) +H5VL_attr_remove(hid_t loc_id, void *location, const char *attr_name, hid_t req) { H5VL_id_wrapper_t *id_wrapper; /* user id structure */ herr_t ret_value = SUCCEED; @@ -836,9 +836,9 @@ H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req) if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(loc_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") - if((ret_value = (id_wrapper->vol_plugin->attr_cls.delete) + if((ret_value = (id_wrapper->vol_plugin->attr_cls.remove) (id_wrapper->obj_id, location, attr_name, req)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTDELETE, FAIL, "delete failed") + HGOTO_ERROR(H5E_VOL, H5E_CANTDELETE, FAIL, "remove failed") done: FUNC_LEAVE_NOAPI(ret_value) @@ -2133,9 +2133,9 @@ done: /*------------------------------------------------------------------------- - * Function: H5VL_link_delete + * Function: H5VL_link_remove * - * Purpose: Copy or delete a link from src to dst. + * Purpose: Removes a link through the VOL. * * Return: Non-negative on success/Negative on failure * @@ -2144,7 +2144,7 @@ done: * *------------------------------------------------------------------------- */ -H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req) +H5_DLL herr_t H5VL_link_remove(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req) { H5VL_id_wrapper_t *id_wrapper; herr_t ret_value = SUCCEED; /* Return value */ @@ -2154,18 +2154,18 @@ H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_ if(NULL == (id_wrapper = (H5VL_id_wrapper_t *)H5I_object(loc_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid user identifier") - /* check if the corresponding VOL delete callback exists */ - if(NULL == id_wrapper->vol_plugin->link_cls.delete) - HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `link delete' method") + /* check if the corresponding VOL remove callback exists */ + if(NULL == id_wrapper->vol_plugin->link_cls.remove) + HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "vol plugin has no `link remove' method") - /* call the corresponding VOL delete callback */ - if((ret_value = (id_wrapper->vol_plugin->link_cls.delete) + /* call the corresponding VOL remove callback */ + if((ret_value = (id_wrapper->vol_plugin->link_cls.remove) (id_wrapper->obj_id, name, udata, lapl_id, req)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "link delete failed") + HGOTO_ERROR(H5E_VOL, H5E_CANTINIT, FAIL, "link remove failed") done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5VL_link_delete() */ +} /* end H5VL_link_remove() */ /*------------------------------------------------------------------------- diff --git a/src/H5VLnative.c b/src/H5VLnative.c index be3d8a3..53d8be8 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -69,7 +69,7 @@ static hid_t H5VL_native_attr_open(hid_t loc_id, void *location, const char *att static herr_t H5VL_native_attr_read(hid_t attr_id, hid_t dtype_id, void *buf, hid_t req); static herr_t H5VL_native_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf, hid_t req); static herr_t H5VL_native_attr_get(hid_t id, H5VL_attr_get_t get_type, hid_t req, va_list arguments); -static herr_t H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req); +static herr_t H5VL_native_attr_remove(hid_t loc_id, void *location, const char *attr_name, hid_t req); static herr_t H5VL_native_attr_close(hid_t attr_id, hid_t req); static herr_t H5VL_native_datatype_commit(hid_t loc_id, const char *name, hid_t type_id, @@ -103,7 +103,7 @@ static herr_t H5VL_native_link_create(H5VL_link_create_type_t create_type, hid_t static herr_t H5VL_native_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t req); static herr_t H5VL_native_link_get(hid_t loc_id, H5VL_link_get_t get_type, hid_t req, va_list arguments); -static herr_t H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); +static herr_t H5VL_native_link_remove(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); static hid_t H5VL_native_object_open(hid_t loc_id, void *location, hid_t lapl_id, hid_t req); static herr_t H5VL_native_object_copy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, @@ -124,7 +124,7 @@ H5VL_class_t H5VL_native_g = { H5VL_native_attr_read, /* read */ H5VL_native_attr_write, /* write */ H5VL_native_attr_get, /* get */ - H5VL_native_attr_delete, /* delete */ + H5VL_native_attr_remove, /* remove */ H5VL_native_attr_close /* close */ }, { /* datatype_cls */ @@ -159,7 +159,7 @@ H5VL_class_t H5VL_native_g = { H5VL_native_link_create, /* create */ H5VL_native_link_move, /* move */ H5VL_native_link_get, /* get */ - H5VL_native_link_delete /* delete */ + H5VL_native_link_remove /* remove */ }, { /* object_cls */ H5VL_native_object_open, /* open */ @@ -615,7 +615,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5VL_native_attr_delete + * Function: H5VL_native_attr_remove * * Purpose: Deletes an attribute from a location * @@ -628,7 +628,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t UNUSED req) +H5VL_native_attr_remove(hid_t loc_id, void *location, const char *attr_name, hid_t UNUSED req) { H5G_loc_t loc; /* Object location */ herr_t ret_value = SUCCEED; /* Return value */ @@ -652,7 +652,7 @@ H5VL_native_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid } done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5VL_native_attr_delete() */ +} /* end H5VL_native_attr_remove() */ /*------------------------------------------------------------------------- @@ -2298,7 +2298,7 @@ done: /*------------------------------------------------------------------------- - * Function: H5VL_native_link_delete + * Function: H5VL_native_link_remove * * Purpose: Removes the specified NAME from the group graph and * decrements the link count for the object to which NAME @@ -2315,7 +2315,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t UNUSED req) +H5VL_native_link_remove(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t UNUSED req) { H5G_loc_t loc; /* Object location */ herr_t ret_value = SUCCEED; @@ -2337,7 +2337,7 @@ H5VL_native_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_ } done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5VL_native_link_delete() */ +} /* end H5VL_native_link_remove() */ /*------------------------------------------------------------------------- diff --git a/src/H5VLprivate.h b/src/H5VLprivate.h index 3e682f6..6f0897d 100644 --- a/src/H5VLprivate.h +++ b/src/H5VLprivate.h @@ -62,7 +62,7 @@ H5_DLL hid_t H5VL_attr_open(hid_t loc_id, void *location, const char *name, hid_ H5_DLL herr_t H5VL_attr_read(hid_t attr_id, hid_t dtype_id, void *buf, hid_t req); H5_DLL herr_t H5VL_attr_write(hid_t attr_id, hid_t dtype_id, const void *buf, hid_t req); H5_DLL herr_t H5VL_attr_get(hid_t id, H5VL_attr_get_t get_type, hid_t req, ...); -H5_DLL herr_t H5VL_attr_delete(hid_t loc_id, void *location, const char *attr_name, hid_t req); +H5_DLL herr_t H5VL_attr_remove(hid_t loc_id, void *location, const char *attr_name, hid_t req); H5_DLL herr_t H5VL_attr_close(hid_t attr_id, hid_t req); H5_DLL hid_t H5VL_dataset_create(hid_t uid, const char *name, hid_t dcpl_id, hid_t dapl_id, hid_t req); @@ -94,7 +94,7 @@ H5_DLL herr_t H5VL_link_create(H5VL_link_create_type_t create_type, hid_t loc_id H5_DLL herr_t H5VL_link_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name, hbool_t copy_flag, hid_t lcpl_id, hid_t lapl_id, hid_t req); H5_DLL herr_t H5VL_link_get(hid_t loc_id, H5VL_link_get_t get_type, hid_t req, ...); -H5_DLL herr_t H5VL_link_delete(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); +H5_DLL herr_t H5VL_link_remove(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); H5_DLL hid_t H5VL_object_open_by_loc(hid_t uid, void *obj_loc, hid_t lapl_id, hid_t req); H5_DLL herr_t H5VL_object_copy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h index 44f3e8f..4a7bd5a 100644 --- a/src/H5VLpublic.h +++ b/src/H5VLpublic.h @@ -131,7 +131,7 @@ typedef struct H5VL_attr_class_t { 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 (*delete)(hid_t loc_id, void *location, const char *attr_name, hid_t req); + 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; @@ -181,7 +181,7 @@ typedef struct H5VL_link_class_t { herr_t (*move) (hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dest_name, hbool_t copy_flag, hid_t lcpl, hid_t lapl, hid_t req); herr_t (*get) (hid_t loc_id, H5VL_link_get_t get_type, hid_t req, va_list arguments); - herr_t (*delete)(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); + herr_t (*remove)(hid_t loc_id, const char *name, void *udata, hid_t lapl_id, hid_t req); } H5VL_link_class_t; /* H5O routines */ -- cgit v0.12