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/h5ls | |
| 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/h5ls')
| -rw-r--r-- | tools/h5ls/h5ls.c | 16 |
1 files changed, 8 insertions, 8 deletions
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 */ |