summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-06-17 11:48:34 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-06-17 11:48:34 (GMT)
commitfb27787c2abb889a2184bb39eead626a144117d0 (patch)
tree7ad16361ac8b2382f0ccf72ce47aae020fed688c /tools/h5ls
parent984ecb72c2fa62d233383b24047e04061754ae34 (diff)
parent6e9e9e0dd200979642de8d2a2bce2f66f9728237 (diff)
downloadhdf5-fb27787c2abb889a2184bb39eead626a144117d0.zip
hdf5-fb27787c2abb889a2184bb39eead626a144117d0.tar.gz
hdf5-fb27787c2abb889a2184bb39eead626a144117d0.tar.bz2
[svn-r27222] Merge of r27035-27221 from the trunk.
Tested on 64-bit linux VM: Serial: C++ and Fortran 2003 Parallel: Fortran
Diffstat (limited to 'tools/h5ls')
-rw-r--r--tools/h5ls/h5ls.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 96bd8d0..28f7b8a 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -385,7 +385,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");
@@ -503,7 +503,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");
@@ -999,7 +999,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;
@@ -1102,7 +1102,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;
@@ -1491,8 +1491,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;
@@ -1743,7 +1743,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 */
@@ -1940,7 +1940,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 */