summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-12-11 05:44:30 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-12-11 05:44:30 (GMT)
commit6b670e353c1ea7f13ef72cc4297d9973102078bb (patch)
tree9055f1cfcdf479509cde6a0d2c86dd2a7ab8cefe /hl
parenteb415973e81605e3c15bbb954d57dd5d42ad449c (diff)
parentf2ef40feb8d1f5f31ab60f78bb37d2ba595aacb8 (diff)
downloadhdf5-6b670e353c1ea7f13ef72cc4297d9973102078bb.zip
hdf5-6b670e353c1ea7f13ef72cc4297d9973102078bb.tar.gz
hdf5-6b670e353c1ea7f13ef72cc4297d9973102078bb.tar.bz2
Merge pull request #2123 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'f2ef40feb8d1f5f31ab60f78bb37d2ba595aacb8': Correct assignment Fix java include, h5watch and remove clang tool. Add missing filenames
Diffstat (limited to 'hl')
-rw-r--r--hl/tools/h5watch/h5watch.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index ef0d5d6..b7f583c 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -132,22 +132,23 @@ doprint(hid_t did, hsize_t *start, hsize_t *block, int rank)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- HDmemset(&ctx, 0, sizeof(ctx));
-
/* Subsetting information for the tools library printing routines */
- ctx.sset->start.data = ss_start;
- ctx.sset->stride.data = ss_stride;
- ctx.sset->block.data = ss_block;
- ctx.sset->count.data = ss_count;
+ subset.start.data = ss_start;
+ subset.stride.data = ss_stride;
+ subset.block.data = ss_block;
+ subset.count.data = ss_count;
/* Initialize subsetting information */
for(i = 0; i < rank; i++) {
- ctx.sset->stride.data[i] = 1;
- ctx.sset->count.data[i] = 1;
- ctx.sset->start.data[i] = start[i];
- ctx.sset->block.data[i] = block[i];
+ subset.stride.data[i] = 1;
+ subset.count.data[i] = 1;
+ subset.start.data[i] = start[i];
+ subset.block.data[i] = block[i];
} /* end for */
+ HDmemset(&ctx, 0, sizeof(ctx));
+ ctx.sset = &subset;
+
/* Set to all default values and then override */
HDmemset(&info, 0, sizeof info);