diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-17 20:59:36 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-04-17 20:59:36 (GMT) |
| commit | 34ada2e41da08bede1962abf5415f41d795c5ee6 (patch) | |
| tree | 523dd0c825a79ae37d89021a1a720ca5fc69b303 /tools/lib/h5tools_dump.c | |
| parent | e12e4936e929ae0dcb1d65acf6bedb422acca01a (diff) | |
| download | hdf5-34ada2e41da08bede1962abf5415f41d795c5ee6.zip hdf5-34ada2e41da08bede1962abf5415f41d795c5ee6.tar.gz hdf5-34ada2e41da08bede1962abf5415f41d795c5ee6.tar.bz2 | |
[svn-r22291] Description:
Bring r22287 from trunk to 1.8 branch:
Clean up more FUNC_ENTER/FUNC_LEAVE macros and move H5D & H5T code toward
the final design (as exemplified by the H5EA & H5FA code).
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug & parallel
Diffstat (limited to 'tools/lib/h5tools_dump.c')
| -rw-r--r-- | tools/lib/h5tools_dump.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index dfbb215..381c358 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -2849,8 +2849,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, hsize_t size; /* size of external file */ hsize_t storage_size; hsize_t curr_pos = 0; /* total data element position */ - hsize_t elmt_counter = 0;/* counts the # elements printed.*/ - haddr_t ioffset; h5tools_str_t buffer; /* string into which to render */ /* setup */ @@ -2860,7 +2858,6 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, storage_size = H5Dget_storage_size(obj_id); nfilters = H5Pget_nfilters(dcpl_id); - ioffset = H5Dget_offset(obj_id); HDstrcpy(f_name,"\0"); /*------------------------------------------------------------------------- @@ -3043,6 +3040,8 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0); } else { + haddr_t ioffset; + ctx->indent_level++; ctx->need_prefix = TRUE; @@ -3063,6 +3062,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_simple_prefix(stream, info, ctx, curr_pos, 0); h5tools_str_reset(&buffer); + ioffset = H5Dget_offset(obj_id); h5tools_str_append(&buffer,"OFFSET "H5_PRINTF_HADDR_FMT, ioffset); h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, 0, 0); @@ -3375,7 +3375,6 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, size_t buf_size = 0; size_t ncols = 80; /* available output width */ h5tools_str_t buffer; /* string into which to render */ - hsize_t elmt_counter = 0;/* counts the # elements printed.*/ hsize_t curr_pos = ctx->sm_pos; /* total data element position */ /* pass to the prefix in h5tools_simple_prefix the total position * instead of the current stripmine position i; this is necessary @@ -3429,7 +3428,6 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, { h5tools_str_t buffer; /* string into which to render */ size_t ncols = 80; /* available output width */ - hsize_t elmt_counter = 0;/* counts the # elements printed.*/ hsize_t curr_pos = ctx->sm_pos; /* total data element position */ /* pass to the prefix in h5tools_simple_prefix the total position * instead of the current stripmine position i; this is necessary |