diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-02-21 22:30:59 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-02-21 22:30:59 (GMT) |
| commit | 6ac5999fe7a73d374cccf0c2acac9c86d35e35fc (patch) | |
| tree | f275f055f258fc023ee82da4f77cdfc495cabcfe /tools/lib/h5tools.c | |
| parent | 42388490d6ad2bca5b3666158df0caae82990155 (diff) | |
| download | hdf5-6ac5999fe7a73d374cccf0c2acac9c86d35e35fc.zip hdf5-6ac5999fe7a73d374cccf0c2acac9c86d35e35fc.tar.gz hdf5-6ac5999fe7a73d374cccf0c2acac9c86d35e35fc.tar.bz2 | |
[svn-r20133] Purpose:
Fixing Bug 2092 - h5dump does not display index for a dataset
Description:
Merged from HDF5 trunk r20108 and r20132.
h5dump skip displaying array indices every certain number when the
array type dataset is relatively big. The certain number varies
according to the size of each array.
This checkin fix the skipping array indices problem. This fix also
correct indentation of the dataset data output.
Tested:
jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), Cmake - jam
Diffstat (limited to 'tools/lib/h5tools.c')
| -rw-r--r-- | tools/lib/h5tools.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index fe582a4..808356d 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -892,8 +892,6 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai */ curr_pos = ctx->sm_pos; - h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); - for (i = 0; i < nelmts; i++, ctx->cur_elmt++, elmt_counter++) { void* memref = mem + i * size; if (region_output && H5Tequal(type, H5T_STD_REF_DSETREG)) { @@ -1086,14 +1084,11 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, */ /* - * Added the info->skip_first because the dumper does not want - * this check to happen for the first line + * check for displaying prefix for each section */ - if ((!info->skip_first || local_elmt_counter) && - (ctx->cur_column + - strlen(section) + - strlen(OPT(info->elmt_suf2, " ")) + - strlen(OPT(info->line_suf, ""))) > ncols) + if ( (ctx->cur_column + strlen(section) + + strlen(OPT(info->elmt_suf2, " ")) + + strlen(OPT(info->line_suf, ""))) > ncols) ctx->need_prefix = 1; /* |