diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2015-11-04 17:49:19 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2015-11-04 17:49:19 (GMT) |
| commit | 11778b82333fd06e625e4c571248910d501a1fd2 (patch) | |
| tree | 3ce7e216d9f56072f43ddf26a50ee9321fe907a9 /tools/h5dump | |
| parent | 77e6ac3324feb5d196745f31df617d568b60d975 (diff) | |
| download | hdf5-11778b82333fd06e625e4c571248910d501a1fd2.zip hdf5-11778b82333fd06e625e4c571248910d501a1fd2.tar.gz hdf5-11778b82333fd06e625e4c571248910d501a1fd2.tar.bz2 | |
[svn-r28274] Applied patch to eliminate warnings from PRINTSTREAM macros from HDF5 1.8.16.
Update supported platform and tested configuration info in RELEASE.txt.
Tested with h5committest.new.
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/h5dump_ddl.c | 6 | ||||
| -rw-r--r-- | tools/h5dump/h5dump_defines.h | 31 |
2 files changed, 21 insertions, 16 deletions
diff --git a/tools/h5dump/h5dump_ddl.c b/tools/h5dump/h5dump_ddl.c index 11052fb..43d397c 100644 --- a/tools/h5dump/h5dump_ddl.c +++ b/tools/h5dump/h5dump_ddl.c @@ -1269,8 +1269,9 @@ dump_fcontents(hid_t fid) unsigned u; for (u = 0; u < type_table->nobjs; u++) { - if (!type_table->objs[u].recorded) + if (!type_table->objs[u].recorded) { PRINTSTREAM(rawoutstream, " %-10s /#"H5_PRINTF_HADDR_FMT"\n", "datatype", type_table->objs[u].objno); + } } } @@ -1874,8 +1875,9 @@ handle_links(hid_t fid, const char *links, void H5_ATTR_UNUSED * data, int H5_AT begin_obj(h5tools_dump_header_format->softlinkbegin, links, h5tools_dump_header_format->softlinkblockbegin); PRINTVALSTREAM(rawoutstream, "\n"); indentation(COL); - if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0) + if(H5Lget_val(fid, links, buf, linfo.u.val_size, H5P_DEFAULT) >= 0) { PRINTSTREAM(rawoutstream, "LINKTARGET \"%s\"\n", buf); + } else { error_msg("h5dump error: unable to get link value for \"%s\"\n", links); h5tools_setstatus(EXIT_FAILURE); diff --git a/tools/h5dump/h5dump_defines.h b/tools/h5dump/h5dump_defines.h index 5f2df43..f1c4451 100644 --- a/tools/h5dump/h5dump_defines.h +++ b/tools/h5dump/h5dump_defines.h @@ -23,23 +23,26 @@ #define COL 3 /* Macros for displaying objects */ -#define begin_obj(obj,name,begin) \ - do { \ - if ((name)) \ +#define begin_obj(obj,name,begin) \ + do { \ + if ((name)) { \ PRINTSTREAM(rawoutstream, "%s \"%s\" %s", (obj), (name), (begin)); \ - else \ - PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin)); \ + } else { \ + PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin)); \ + } \ } while(0); -#define end_obj(obj,end) \ - do { \ - if(HDstrlen(end)) { \ - PRINTSTREAM(rawoutstream, "%s", end); \ - if(HDstrlen(obj)) \ - PRINTVALSTREAM(rawoutstream, " "); \ - } \ - if(HDstrlen(obj)) \ - PRINTSTREAM(rawoutstream, "%s", obj); \ +#define end_obj(obj,end) \ + do { \ + if(HDstrlen(end)) { \ + PRINTSTREAM(rawoutstream, "%s", end); \ + if(HDstrlen(obj)) { \ + PRINTVALSTREAM(rawoutstream, " "); \ + } \ + } \ + if(HDstrlen(obj)) { \ + PRINTSTREAM(rawoutstream, "%s", obj); \ + } \ } while(0); |