[svn-r28365] Fixed trivial warnings in h5watch code.

Tested on Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
    serial only

3 files changed, 26 insertions, 9 deletions

diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c
index 79b06a0..7efdd3b 100644
--- a/hl/tools/h5watch/extend_dset.c
+++ b/hl/tools/h5watch/extend_dset.c
@@ -1,4 +1,20 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+ * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #include "H5HLprivate2.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
@@ -154,9 +170,9 @@ extend_dset_two(const char *file, char *dname)
 {
     hid_t fid = -1;		/* file id */
     hid_t fapl = -1;		/* file access property list id */
-    hid_t did; 		/* dataset id */
-    hid_t sid; 		/* dataspace id */
-    hid_t dtid;		/* dataset's datatype id */
+    hid_t did = -1; 		/* dataset id */
+    hid_t sid = -1; 		/* dataspace id */
+    hid_t dtid = -1;		/* dataset's datatype id */
     int ndims;		/* # of dimension sizes */
     unsigned i, j;	/* local index variable */
     hsize_t ext_dims[2];	/* new dimension sizes after extension */
@@ -299,10 +315,10 @@ extend_dset_one(const char *file, char *dname)
 {
     hid_t fid = -1;	/* file id */
     hid_t fapl = -1;	/* file access property list id */
-    hid_t did; 		/* dataset id */
-    hid_t dtid;		/* dataset's datatype id */
-    hid_t sid;		/* dataspace id */
-    hid_t mid;		/* memory space id */
+    hid_t did = -1; 		/* dataset id */
+    hid_t dtid = -1;		/* dataset's datatype id */
+    hid_t sid = -1;		/* dataspace id */
+    hid_t mid = -1;		/* memory space id */
     unsigned i, j;	/* local index variable */
     int ibuf[TEST_BUF_SIZE];   	/* buffer for storing retrieved elements (integer) */
     set_t cbuf[TEST_BUF_SIZE];	/* buffer for storing retrieved elemnets (compound) */
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index ea37dae..643b4e7 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -12,6 +12,7 @@
  * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
  * access to either file, you may request a copy from help@hdfgroup.org.     *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/hl/tools/h5watch/h5watchgentest.c b/hl/tools/h5watch/h5watchgentest.c
index c4bb7d7..d70a690 100644
--- a/hl/tools/h5watch/h5watchgentest.c
+++ b/hl/tools/h5watch/h5watchgentest.c
@@ -227,7 +227,7 @@ main(void)
         one_cbuf[i].field2.b.a = 20;
         one_cbuf[i].field2.b.b = 40;
         one_cbuf[i].field2.b.c = 80;
-        one_cbuf[i].field3 = 3.0;
+        one_cbuf[i].field3 = 3.0F;
         one_cbuf[i].field4.a = 4;
         one_cbuf[i].field4.b = 8;
     }
@@ -316,7 +316,7 @@ main(void)
         two_cbuf[i].field2.b.a = 20;
         two_cbuf[i].field2.b.b = 40;
         two_cbuf[i].field2.b.c = 80;
-        two_cbuf[i].field3 = 3.0;
+        two_cbuf[i].field3 = 3.0F;
         two_cbuf[i].field4.a = 4;
         two_cbuf[i].field4.b = 8;
     }