diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-08 21:30:38 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-08 21:30:38 (GMT) |
commit | db4acaf3abfcc3e156e7ac575005257ea4e3e065 (patch) | |
tree | 0a496cf3d24b757f52133f3ce8e7f2b9e0cbd654 /tools | |
parent | 2fdeab0ebde453b113cfab01b6bc32003e6e3275 (diff) | |
download | hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.zip hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.gz hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.bz2 |
[svn-r27165] Merge 27133 & 27158 from trunk:
- Add a new attribute function characterstic for format:
* H5_ATTR_FORMAT(X,Y,Z) __attribute__((format(X, Y, Z)))
- Rename UNUSED attribute characterstic to H5_ATTR_UNUSED.
- Rename NORETURN attribute characterstic to H5_ATTR_NORETURN
tested with h5committest.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/h5diff/h5diffgentest.c | 4 | ||||
-rw-r--r-- | tools/h5dump/h5dump_ddl.c | 18 | ||||
-rw-r--r-- | tools/h5dump/h5dump_ddl.h | 8 | ||||
-rw-r--r-- | tools/h5dump/h5dump_xml.c | 10 | ||||
-rw-r--r-- | tools/h5dump/h5dumpgentest.c | 20 | ||||
-rw-r--r-- | tools/h5jam/h5jamgentest.c | 4 | ||||
-rw-r--r-- | tools/h5ls/h5ls.c | 16 | ||||
-rw-r--r-- | tools/h5repack/h5repack_copy.c | 2 | ||||
-rw-r--r-- | tools/h5repack/h5repack_main.c | 2 | ||||
-rw-r--r-- | tools/h5stat/h5stat.c | 2 | ||||
-rw-r--r-- | tools/lib/h5tools_ref.c | 4 | ||||
-rw-r--r-- | tools/lib/h5trav.c | 8 | ||||
-rw-r--r-- | tools/perform/chunk.c | 12 | ||||
-rw-r--r-- | tools/perform/overhead.c | 6 | ||||
-rw-r--r-- | tools/perform/perf.c | 2 |
15 files changed, 59 insertions, 59 deletions
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index 1b80317..cfaffe6 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -106,8 +106,8 @@ hsize_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024); #define SPACE1_DIM2 0 /* A UD link traversal function. Shouldn't actually be called. */ -static hid_t UD_traverse(UNUSED const char * link_name, UNUSED hid_t cur_group, - UNUSED const void * udata, UNUSED size_t udata_size, UNUSED hid_t lapl_id) +static hid_t UD_traverse(H5_ATTR_UNUSED const char * link_name, H5_ATTR_UNUSED hid_t cur_group, + H5_ATTR_UNUSED const void * udata, H5_ATTR_UNUSED size_t udata_size, H5_ATTR_UNUSED hid_t lapl_id) { return -1; } diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index 1227e6e..11052fb 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -112,7 +112,7 @@ dump_dataspace(hid_t space) *------------------------------------------------------------------------- */ herr_t -dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *info, void UNUSED *_op_data) +dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *info, void H5_ATTR_UNUSED *_op_data) { h5tools_context_t ctx; /* print context */ h5tool_format_t *outputformat = &h5tools_dataformat; @@ -182,7 +182,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *info, vo *------------------------------------------------------------------------- */ static herr_t -dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED *op_data) +dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR_UNUSED *op_data) { hid_t obj; herr_t ret = SUCCEED; @@ -1281,7 +1281,7 @@ dump_fcontents(hid_t fid) } static herr_t -attr_search(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *_op_data) +attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data) { herr_t ret = SUCCEED; int i; @@ -1337,7 +1337,7 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t UNUSED *ainfo, vo } /* end attr_search() */ static herr_t -obj_search(const char *path, const H5O_info_t *oi, const char UNUSED *already_visited, void *_op_data) +obj_search(const char *path, const H5O_info_t *oi, const char H5_ATTR_UNUSED *already_visited, void *_op_data) { trav_handle_udata_t *handle_data = (trav_handle_udata_t*)_op_data; char *op_name = (char*)handle_data->op_name; @@ -1429,7 +1429,7 @@ lnk_search(const char *path, const H5L_info_t *li, void *_op_data) *------------------------------------------------------------------------- */ void -handle_paths(hid_t fid, const char *path_name, void UNUSED * data, int UNUSED pe, const char UNUSED *display_name) +handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name) { hid_t gid = -1; @@ -1492,7 +1492,7 @@ handle_paths(hid_t fid, const char *path_name, void UNUSED * data, int UNUSED pe *------------------------------------------------------------------------- */ void -handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe, const char UNUSED *display_name) +handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name) { hid_t oid = -1; hid_t attr_id = -1; @@ -1803,7 +1803,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis *------------------------------------------------------------------------- */ void -handle_groups(hid_t fid, const char *group, void UNUSED *data, int pe, const char *display_name) +handle_groups(hid_t fid, const char *group, void H5_ATTR_UNUSED *data, int pe, const char *display_name) { hid_t gid; const char *real_name = display_name ? display_name : group; @@ -1853,7 +1853,7 @@ handle_groups(hid_t fid, const char *group, void UNUSED *data, int pe, const cha *------------------------------------------------------------------------- */ void -handle_links(hid_t fid, const char *links, void UNUSED * data, int UNUSED pe, const char UNUSED *display_name) +handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name) { H5L_info_t linfo; @@ -1948,7 +1948,7 @@ handle_links(hid_t fid, const char *links, void UNUSED * data, int UNUSED pe, co *------------------------------------------------------------------------- */ void -handle_datatypes(hid_t fid, const char *type, void UNUSED * data, int pe, const char *display_name) +handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED * data, int pe, const char *display_name) { hid_t type_id; const char *real_name = display_name ? display_name : type; diff --git a/tools/h5dump/h5dump_ddl.h b/tools/h5dump/h5dump_ddl.h index c4f4638..6cd9181 100644 --- a/tools/h5dump/h5dump_ddl.h +++ b/tools/h5dump/h5dump_ddl.h @@ -36,10 +36,10 @@ herr_t dump_attr_cb(hid_t loc_id, const char *attr_name, const H5A_info_t *in void handle_paths(hid_t fid, const char *path_name, void *data, int pe, const char *display_name); void handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *display_name); -void handle_attributes(hid_t fid, const char *attr, void UNUSED * data, int UNUSED pe, const char UNUSED *display_name); -void handle_groups(hid_t fid, const char *group, void UNUSED *data, int pe, const char *display_name); -void handle_links(hid_t fid, const char *links, void UNUSED * data, int UNUSED pe, const char UNUSED *display_name); -void handle_datatypes(hid_t fid, const char *type, void UNUSED * data, int pe, const char *display_name); +void handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name); +void handle_groups(hid_t fid, const char *group, void H5_ATTR_UNUSED *data, int pe, const char *display_name); +void handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_ATTR_UNUSED pe, const char H5_ATTR_UNUSED *display_name); +void handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED * data, int pe, const char *display_name); #ifdef __cplusplus } diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c index 64667cb..353a0c3 100644 --- a/tools/h5dump/h5dump_xml.c +++ b/tools/h5dump/h5dump_xml.c @@ -141,7 +141,7 @@ static char *xml_escape_the_name(const char *); *------------------------------------------------------------------------- */ static herr_t -xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void UNUSED *op_data) +xml_dump_all_cb(hid_t group, const char *name, const H5L_info_t *linfo, void H5_ATTR_UNUSED *op_data) { hid_t obj; herr_t ret = SUCCEED; @@ -1854,7 +1854,7 @@ xml_dump_dataspace(hid_t space) *------------------------------------------------------------------------- */ void -xml_dump_data(hid_t obj_id, int obj_data, struct subset_t UNUSED * sset, int UNUSED pindex) +xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED * sset, int H5_ATTR_UNUSED pindex) { hid_t space = -1; hid_t type = -1; @@ -2051,8 +2051,8 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t UNUSED * sset, int UNU *------------------------------------------------------------------------- */ herr_t -xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t UNUSED *info, - void UNUSED * op_data) +xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *info, + void H5_ATTR_UNUSED * op_data) { hid_t attr_id = -1; hid_t type = -1; @@ -3753,7 +3753,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type) *------------------------------------------------------------------------- */ void -xml_dump_dataset(hid_t did, const char *name, struct subset_t UNUSED * sset) +xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED * sset) { hid_t type; hid_t space; diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 012dbe0..5a6ccca 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -123,13 +123,13 @@ write_dset( hid_t loc_id, int rank, hsize_t *dims, const char *dset_name, /* a filter operation callback function */ static size_t -myfilter(unsigned int UNUSED flags, size_t UNUSED cd_nelmts, - const unsigned int UNUSED *cd_values, size_t nbytes, - size_t UNUSED *buf_size, void UNUSED **buf); +myfilter(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts, + const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, + size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf); /* a "set local" callback */ static herr_t -set_local_myfilter(hid_t dcpl_id, hid_t tid, hid_t UNUSED sid); +set_local_myfilter(hid_t dcpl_id, hid_t tid, hid_t H5_ATTR_UNUSED sid); #define MYFILTER_ID 405 @@ -146,8 +146,8 @@ const H5Z_class2_t H5Z_MYFILTER[1] = {{ /* A UD link traversal function. Shouldn't actually be called. */ -static hid_t UD_traverse(UNUSED const char * link_name, UNUSED hid_t cur_group, - UNUSED const void * udata, UNUSED size_t udata_size, UNUSED hid_t lapl_id) +static hid_t UD_traverse(H5_ATTR_UNUSED const char * link_name, H5_ATTR_UNUSED hid_t cur_group, + H5_ATTR_UNUSED const void * udata, H5_ATTR_UNUSED size_t udata_size, H5_ATTR_UNUSED hid_t lapl_id) { return -1; } @@ -5586,9 +5586,9 @@ static void gent_filters(void) *------------------------------------------------------------------------- */ static size_t -myfilter(unsigned int UNUSED flags, size_t UNUSED cd_nelmts, - const unsigned int UNUSED *cd_values, size_t nbytes, - size_t UNUSED *buf_size, void UNUSED **buf) +myfilter(unsigned int H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts, + const unsigned int H5_ATTR_UNUSED *cd_values, size_t nbytes, + size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf) { return nbytes; } @@ -5603,7 +5603,7 @@ myfilter(unsigned int UNUSED flags, size_t UNUSED cd_nelmts, */ static herr_t -set_local_myfilter(hid_t dcpl_id, hid_t UNUSED tid, hid_t UNUSED sid) +set_local_myfilter(hid_t dcpl_id, hid_t H5_ATTR_UNUSED tid, hid_t H5_ATTR_UNUSED sid) { unsigned flags; /* Filter flags */ size_t cd_nelmts = 0; /* Number of filter parameters */ diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c index 5a93c13..5f24566 100644 --- a/tools/h5jam/h5jamgentest.c +++ b/tools/h5jam/h5jamgentest.c @@ -96,8 +96,8 @@ typedef struct s1_t { #define ARRAY3_DIM2 3 /* A UD link traversal function. Shouldn't actually be called. */ -static hid_t UD_traverse(const char UNUSED * link_name, hid_t UNUSED cur_group, - const void UNUSED * udata, size_t UNUSED udata_size, hid_t UNUSED lapl_id) +static hid_t UD_traverse(const char H5_ATTR_UNUSED * link_name, hid_t H5_ATTR_UNUSED cur_group, + const void H5_ATTR_UNUSED * udata, size_t H5_ATTR_UNUSED udata_size, hid_t H5_ATTR_UNUSED lapl_id) { return -1; } diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 9d19706..4e88ed2 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -389,7 +389,7 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname, *------------------------------------------------------------------------- */ static hbool_t -print_native_type(h5tools_str_t *buffer, hid_t type, int UNUSED ind) +print_native_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind) { if (H5Tequal(type, H5T_NATIVE_SCHAR)==TRUE) { h5tools_str_append(buffer, "native signed char"); @@ -507,7 +507,7 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int UNUSED ind) *------------------------------------------------------------------------- */ static hbool_t -print_ieee_type(h5tools_str_t *buffer, hid_t type, int UNUSED ind) +print_ieee_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind) { if (H5Tequal(type, H5T_IEEE_F32BE)==TRUE) { h5tools_str_append(buffer, "IEEE 32-bit big-endian float"); @@ -1003,7 +1003,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind) *------------------------------------------------------------------------- */ static hbool_t -print_string_type(h5tools_str_t *buffer, hid_t type, int UNUSED ind) +print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind) { H5T_str_t pad; const char *pad_s=NULL; @@ -1106,7 +1106,7 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int UNUSED ind) *------------------------------------------------------------------------- */ static hbool_t -print_reference_type(h5tools_str_t *buffer, hid_t type, int UNUSED ind) +print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind) { if (H5T_REFERENCE!=H5Tget_class(type)) return FALSE; @@ -1495,8 +1495,8 @@ dump_dataset_values(hid_t dset) *------------------------------------------------------------------------- */ static herr_t -list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, - void UNUSED *op_data) +list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, + void H5_ATTR_UNUSED *op_data) { hid_t attr = -1; hid_t space = -1; @@ -1747,7 +1747,7 @@ dataset_list1(hid_t dset) *------------------------------------------------------------------------- */ static herr_t -dataset_list2(hid_t dset, const char UNUSED *name) +dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name) { hid_t dcpl; /* dataset creation property list */ hid_t type; /* data type of dataset */ @@ -1944,7 +1944,7 @@ dataset_list2(hid_t dset, const char UNUSED *name) *------------------------------------------------------------------------- */ static herr_t -datatype_list2(hid_t type, const char UNUSED *name) +datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name) { if (verbose_g>0) { hsize_t curr_pos = 0; /* total data element position */ diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index a25e789..1963750 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -66,7 +66,7 @@ static void print_user_block(const char *filename, hid_t fid); static herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void *udata); /* get the major number from the error stack. */ -static herr_t walk_error_callback(UNUSED unsigned n, const H5E_error2_t *err_desc, void *udata) { +static herr_t walk_error_callback(H5_ATTR_UNUSED unsigned n, const H5E_error2_t *err_desc, void *udata) { if (err_desc) *((int *) udata) = err_desc->maj_num; diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c index 2d896f7..f3fd469 100644 --- a/tools/h5repack/h5repack_main.c +++ b/tools/h5repack/h5repack_main.c @@ -21,7 +21,7 @@ #define PROGRAMNAME "h5repack" static int parse_command_line(int argc, const char **argv, pack_opt_t* options); -static void leave(int ret) NORETURN; +static void leave(int ret) H5_ATTR_NORETURN; /* module-scoped variables */ diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c index a3a0d13..4cdb816 100644 --- a/tools/h5stat/h5stat.c +++ b/tools/h5stat/h5stat.c @@ -717,7 +717,7 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited, *------------------------------------------------------------------------- */ static herr_t -lnk_stats(const char UNUSED *path, const H5L_info_t *li, void *_iter) +lnk_stats(const char H5_ATTR_UNUSED *path, const H5L_info_t *li, void *_iter) { iter_t *iter = (iter_t *)_iter; diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index caf71df..3a4183b 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -61,7 +61,7 @@ static int ref_path_table_put(const char *, haddr_t objno); *------------------------------------------------------------------------- */ static herr_t -free_ref_path_info(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/) +free_ref_path_info(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data/*in,out*/) { ref_path_node_t *node = (ref_path_node_t *)item; @@ -85,7 +85,7 @@ free_ref_path_info(void *item, void UNUSED *key, void UNUSED *operator_data/*in, */ static herr_t init_ref_path_cb(const char *obj_name, const H5O_info_t *oinfo, - const char *already_seen, void UNUSED *_udata) + const char *already_seen, void H5_ATTR_UNUSED *_udata) { /* Check if the object is already in the path table */ if(NULL == already_seen) { diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index 90e6d3d..86e60c3 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -404,7 +404,7 @@ trav_fileinfo_add(trav_info_t *info, hid_t loc_id) */ int trav_info_visit_obj(const char *path, const H5O_info_t *oinfo, - const char UNUSED *already_visited, void *udata) + const char H5_ATTR_UNUSED *already_visited, void *udata) { size_t idx; trav_info_t *info_p; @@ -628,7 +628,7 @@ trav_table_visit_obj(const char *path, const H5O_info_t *oinfo, *------------------------------------------------------------------------- */ static int -trav_table_visit_lnk(const char *path, const H5L_info_t UNUSED *linfo, void *udata) +trav_table_visit_lnk(const char *path, const H5L_info_t H5_ATTR_UNUSED *linfo, void *udata) { /* Add the link to the 'table' struct */ trav_table_add((trav_table_t *)udata, path, NULL); @@ -901,9 +901,9 @@ void trav_table_free( trav_table_t *table ) static herr_t trav_attr(hid_t #ifndef H5TRAV_PRINT_SPACE -UNUSED +H5_ATTR_UNUSED #endif /* H5TRAV_PRINT_SPACE */ -obj, const char *attr_name, const H5A_info_t UNUSED *ainfo, void *_op_data) +obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ainfo, void *_op_data) { trav_path_op_data_t *op_data = (trav_path_op_data_t *)_op_data; const char *buf = op_data->path; diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c index 6825a4c..625809a 100644 --- a/tools/perform/chunk.c +++ b/tools/perform/chunk.c @@ -37,9 +37,9 @@ #if !defined(H5_HAVE_ATTRIBUTE) || defined __cplusplus # undef __attribute__ # define __attribute__(X) /*void*/ -# define UNUSED /*void*/ +# define H5_ATTR_UNUSED /*void*/ #else -# define UNUSED __attribute__((unused)) +# define H5_ATTR_UNUSED __attribute__((unused)) #endif #define FILE_NAME "chunk.h5" @@ -78,7 +78,7 @@ static hid_t fapl_g = -1; /* Local function prototypes */ static size_t -counter (unsigned UNUSED flags, size_t cd_nelmts, +counter (unsigned H5_ATTR_UNUSED flags, size_t cd_nelmts, const unsigned *cd_values, size_t nbytes, size_t *buf_size, void **buf); @@ -111,9 +111,9 @@ const H5Z_class2_t H5Z_COUNTER[1] = {{ *------------------------------------------------------------------------- */ static size_t -counter (unsigned UNUSED flags, size_t UNUSED cd_nelmts, - const unsigned UNUSED *cd_values, size_t nbytes, - size_t UNUSED *buf_size, void UNUSED **buf) +counter (unsigned H5_ATTR_UNUSED flags, size_t H5_ATTR_UNUSED cd_nelmts, + const unsigned H5_ATTR_UNUSED *cd_values, size_t nbytes, + size_t H5_ATTR_UNUSED *buf_size, void H5_ATTR_UNUSED **buf) { nio_g += nbytes; return nbytes; diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c index 046668f..0e9166c 100644 --- a/tools/perform/overhead.c +++ b/tools/perform/overhead.c @@ -49,9 +49,9 @@ #ifndef H5_HAVE_ATTRIBUTE # undef __attribute__ # define __attribute__(X) /*void*/ -# define UNUSED /*void*/ +# define H5_ATTR_UNUSED /*void*/ #else -# define UNUSED __attribute__((unused)) +# define H5_ATTR_UNUSED __attribute__((unused)) #endif #define FILE_NAME_1 "overhead.h5" @@ -163,7 +163,7 @@ cleanup (void) *------------------------------------------------------------------------- */ static herr_t -display_error_cb (hid_t estack, void UNUSED *client_data) +display_error_cb (hid_t estack, void H5_ATTR_UNUSED *client_data) { puts ("*FAILED*"); H5Eprint2(estack, stdout); diff --git a/tools/perform/perf.c b/tools/perform/perf.c index 1bd33b6..afd13c0 100644 --- a/tools/perform/perf.c +++ b/tools/perform/perf.c @@ -473,7 +473,7 @@ parse_args(int argc, char **argv) #else /* H5_HAVE_PARALLEL */ /* dummy program since H5_HAVE_PARALLEL is not configured in */ int -main(int UNUSED argc, char UNUSED **argv) +main(int H5_ATTR_UNUSED argc, char H5_ATTR_UNUSED **argv) { printf("No parallel performance because parallel is not configured in\n"); return(0); |