Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '6b670e353c1ea7f13ef72cc4297d9973102078bb':
  Correct assignment
  Fix java include, h5watch and remove clang tool.
  Add missing filenames

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);