diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-06-02 14:46:51 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-06-02 14:46:51 (GMT) |
commit | f486fe1a495840b0da77a7642a7e572fac3a64b0 (patch) | |
tree | f1e361fa03bb72509736917c7f3ad71cd1f056ce /test/links.c | |
parent | 17a9efa359e335542f84dcedf5d30c87420cbd9d (diff) | |
parent | fc45d5fcb05fbf1b9ee05a46a25afc6fd6c40503 (diff) | |
download | hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.zip hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.gz hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.bz2 |
[svn-r27137] svn merge -r27115:27135 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'test/links.c')
-rw-r--r-- | test/links.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/test/links.c b/test/links.c index 0846c49..cfbc4a1 100644 --- a/test/links.c +++ b/test/links.c @@ -7320,8 +7320,8 @@ error: /* Callback functions for UD hard links. */ /* UD_hard_create increments the object's reference count */ static herr_t -UD_hard_create(const char UNUSED * link_name, hid_t loc_group, const void *udata, - size_t udata_size, hid_t UNUSED lcpl_id) +UD_hard_create(const char H5_ATTR_UNUSED * link_name, hid_t loc_group, const void *udata, + size_t udata_size, hid_t H5_ATTR_UNUSED lcpl_id) { haddr_t addr; hid_t target_obj = -1; @@ -7389,8 +7389,8 @@ done: /* Traverse a hard link by opening the object */ static hid_t -UD_hard_traverse(const char UNUSED *link_name, hid_t cur_group, - const void *udata, size_t udata_size, hid_t UNUSED lapl_id) +UD_hard_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t H5_ATTR_UNUSED lapl_id) { haddr_t addr; hid_t ret_value = -1; @@ -7407,7 +7407,7 @@ UD_hard_traverse(const char UNUSED *link_name, hid_t cur_group, /* UD_hard_delete decrements the object's reference count */ static herr_t -UD_hard_delete(const char UNUSED * link_name, hid_t file, const void *udata, +UD_hard_delete(const char H5_ATTR_UNUSED * link_name, hid_t file, const void *udata, size_t udata_size) { haddr_t addr; @@ -7625,8 +7625,8 @@ ud_hard_links(hid_t fapl) * in the current group named REREG_TARGET_NAME */ static hid_t -UD_rereg_traverse(const char UNUSED * link_name, hid_t cur_group, - const void UNUSED *udata, size_t UNUSED udata_size, hid_t lapl_id) +UD_rereg_traverse(const char H5_ATTR_UNUSED * link_name, hid_t cur_group, + const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id) { hid_t ret_value; @@ -8064,8 +8064,8 @@ error: *------------------------------------------------------------------------- */ static hid_t -UD_plist_traverse(const char UNUSED * link_name, hid_t cur_group, - const void UNUSED *udata, size_t udata_size, hid_t lapl_id) +UD_plist_traverse(const char H5_ATTR_UNUSED * link_name, hid_t cur_group, + const void H5_ATTR_UNUSED *udata, size_t udata_size, hid_t lapl_id) { char target[NAME_BUF_SIZE]; hid_t ret_value; @@ -8203,8 +8203,8 @@ lapl_udata(hid_t fapl, hbool_t new_format) *------------------------------------------------------------------------- */ static herr_t -UD_cbsucc_create(const char UNUSED * link_name, hid_t UNUSED loc_group, - const void *udata, size_t udata_size, hid_t UNUSED lcpl_id) +UD_cbsucc_create(const char H5_ATTR_UNUSED * link_name, hid_t H5_ATTR_UNUSED loc_group, + const void *udata, size_t udata_size, hid_t H5_ATTR_UNUSED lcpl_id) { /* Check to make sure that this "soft link" has a target */ if(udata_size < 1 || !udata) @@ -8214,8 +8214,8 @@ UD_cbsucc_create(const char UNUSED * link_name, hid_t UNUSED loc_group, } /* end UD_cbsucc_create() */ static hid_t -UD_cbsucc_traverse(const char UNUSED *link_name, hid_t cur_group, - const void *udata, size_t UNUSED udata_size, hid_t lapl_id) +UD_cbsucc_traverse(const char H5_ATTR_UNUSED *link_name, hid_t cur_group, + const void *udata, size_t H5_ATTR_UNUSED udata_size, hid_t lapl_id) { const char *target = (const char *)udata; hid_t ret_value; @@ -8232,8 +8232,8 @@ error: /* Failure callback for when the link is moved or renamed */ static herr_t -UD_cbfail_move(const char UNUSED *new_name, hid_t UNUSED new_loc, - const void UNUSED *udata, size_t UNUSED udata_size) +UD_cbfail_move(const char H5_ATTR_UNUSED *new_name, hid_t H5_ATTR_UNUSED new_loc, + const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size) { /* This traversal function will always fail. */ return -1; @@ -8241,8 +8241,8 @@ UD_cbfail_move(const char UNUSED *new_name, hid_t UNUSED new_loc, /* SuccessCallback for when the link is moved or renamed */ static herr_t -UD_cbsucc_move(const char UNUSED *new_name, hid_t UNUSED new_loc, - const void UNUSED *udata, size_t UNUSED udata_size) +UD_cbsucc_move(const char H5_ATTR_UNUSED *new_name, hid_t H5_ATTR_UNUSED new_loc, + const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size) { /* This traversal function will always succeed. */ return 0; @@ -8250,8 +8250,8 @@ UD_cbsucc_move(const char UNUSED *new_name, hid_t UNUSED new_loc, /* Callback for when the link is deleted. Also called during move */ static herr_t -UD_cbsucc_delete(const char UNUSED *link_name, hid_t UNUSED file, - const void UNUSED *udata, size_t UNUSED udata_size) +UD_cbsucc_delete(const char H5_ATTR_UNUSED *link_name, hid_t H5_ATTR_UNUSED file, + const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size) { /* This callback will always succeed */ return 0; @@ -8259,8 +8259,8 @@ UD_cbsucc_delete(const char UNUSED *link_name, hid_t UNUSED file, /* Callback for when the link is deleted. Also called during move */ static herr_t -UD_cbfail_delete(const char UNUSED *link_name, hid_t UNUSED file, - const void UNUSED *udata, size_t UNUSED udata_size) +UD_cbfail_delete(const char H5_ATTR_UNUSED *link_name, hid_t H5_ATTR_UNUSED file, + const void H5_ATTR_UNUSED *udata, size_t H5_ATTR_UNUSED udata_size) { /* This traversal function will always fail. */ /* Note: un-deletable links are in general a very bad idea! */ @@ -8269,8 +8269,8 @@ UD_cbfail_delete(const char UNUSED *link_name, hid_t UNUSED file, /* Callback for when the link is queried */ static ssize_t -UD_cbfail_query(const char UNUSED *link_name, const void UNUSED *udata, - size_t UNUSED udata_size, void UNUSED *buf, size_t UNUSED buf_size) +UD_cbfail_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED *udata, + size_t H5_ATTR_UNUSED udata_size, void H5_ATTR_UNUSED *buf, size_t H5_ATTR_UNUSED buf_size) { /* This traversal function will always fail. */ return -1; @@ -8278,8 +8278,8 @@ UD_cbfail_query(const char UNUSED *link_name, const void UNUSED *udata, /* Callback for when the link is queried */ static ssize_t -UD_cbfail_on_write_query(const char UNUSED *link_name, const void UNUSED *udata, - size_t UNUSED udata_size, void *buf, size_t UNUSED buf_size) +UD_cbfail_on_write_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED *udata, + size_t H5_ATTR_UNUSED udata_size, void *buf, size_t H5_ATTR_UNUSED buf_size) { /* This traversal function will return a buffer size, * but will fail when a buffer is passed in ("writing to the buffer" @@ -8294,8 +8294,8 @@ UD_cbfail_on_write_query(const char UNUSED *link_name, const void UNUSED *udata, /* Callback for when the link is queried */ static ssize_t -UD_cbsucc_query(const char UNUSED *link_name, const void UNUSED *udata, - size_t UNUSED udata_size, void *buf, size_t buf_size) +UD_cbsucc_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED *udata, + size_t H5_ATTR_UNUSED udata_size, void *buf, size_t buf_size) { /* This traversal function will return a buffer size, * but will fail when a buffer is passed in ("writing to the buffer" @@ -9007,7 +9007,7 @@ error: *------------------------------------------------------------------------- */ static int -visit_link_cb(hid_t UNUSED group_id, const char *name, const H5L_info_t *linfo, +visit_link_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5L_info_t *linfo, void *_op_data) { lvisit_ud_t *op_data = (lvisit_ud_t *)_op_data; @@ -9185,7 +9185,7 @@ error: *------------------------------------------------------------------------- */ static int -visit_obj_cb(hid_t UNUSED group_id, const char *name, const H5O_info_t *oinfo, +visit_obj_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5O_info_t *oinfo, void *_op_data) { ovisit_ud_t *op_data = (ovisit_ud_t *)_op_data; @@ -9363,7 +9363,7 @@ error: *------------------------------------------------------------------------- */ static int -visit_obj_stop_cb(hid_t UNUSED group_id, const char UNUSED *name, const H5O_info_t UNUSED *oinfo, +visit_obj_stop_cb(hid_t H5_ATTR_UNUSED group_id, const char H5_ATTR_UNUSED *name, const H5O_info_t H5_ATTR_UNUSED *oinfo, void *_op_data) { unsigned *op_data = (unsigned *)_op_data; @@ -9489,8 +9489,8 @@ static herr_t link_filter_set_local(hid_t dcpl_id, hid_t type_id, hid_t space_id } /* end link_filter_set_local */ static size_t link_filter_filter(unsigned int flags, size_t cd_nelmts, - const unsigned int cd_values[], size_t nbytes, size_t UNUSED *buf_size, - void UNUSED **buf) + const unsigned int cd_values[], size_t nbytes, size_t H5_ATTR_UNUSED *buf_size, + void H5_ATTR_UNUSED **buf) { if(flags & H5Z_FLAG_OPTIONAL || cd_nelmts != 1 || cd_values[0] != 2112) return 0; @@ -11990,8 +11990,8 @@ group_iterate_cb(hid_t group_id, const char *link_name, void *_op_data) *------------------------------------------------------------------------- */ static int -link_iterate_fail_cb(hid_t UNUSED group_id, const char UNUSED *link_name, - const H5L_info_t UNUSED *info, void UNUSED *_op_data) +link_iterate_fail_cb(hid_t H5_ATTR_UNUSED group_id, const char H5_ATTR_UNUSED *link_name, + const H5L_info_t H5_ATTR_UNUSED *info, void H5_ATTR_UNUSED *_op_data) { return(H5_ITER_ERROR); } /* end link_iterate_fail_cb() */ |