TRILAB-81 coverity fixes

4 files changed, 12 insertions, 11 deletions

diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index e399d8f..ec76511 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -3438,8 +3438,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "\"");
             for (i = 0; i < sz; i++) {
-                h5tools_str_append(&buffer, "%x ", *(unsigned int *) buf);
-                buf = (char *) buf + sizeof(unsigned int);
+                h5tools_str_append(&buffer, "%x ", *(unsigned int *) buf + (i * sizeof(unsigned int)));
             }
             h5tools_str_append(&buffer, "\"");
             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 3b64a0e..ea40322 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -98,6 +98,9 @@ int main(int argc, char *argv[])
     (void) HDsetvbuf(stderr, (char *) NULL, _IOLBF, 0);
     (void) HDsetvbuf(stdout, (char *) NULL, _IOLBF, 0);
 
+    /* Initialize the file structure to 0 */
+    HDmemset(&opt, 0, sizeof(struct Options));
+
     if (argv[1] && (HDstrcmp("-V", argv[1]) == 0)) {
         print_version(PROGRAMNAME);
         HDexit(EXIT_SUCCESS);
@@ -112,9 +115,6 @@ int main(int argc, char *argv[])
         goto err;
     }
 
-    /* Initialize the file structure to 0 */
-    HDmemset(&opt, 0, sizeof(struct Options));
-
     /*
      * parse the command line
      */
@@ -1665,7 +1665,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                             }
                             else { /* Dimension */
                                 icount++;
-                                if (icount > MAX_NUM_DIMENSION) {
+                                if (icount >+ MAX_NUM_DIMENSION) {
                                     (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                     goto error;
                                 }
@@ -1750,7 +1750,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                                 else { /* comma */
                                     i++;
-                                    if (i > MAX_NUM_DIMENSION) {
+                                    if (i >= MAX_NUM_DIMENSION) {
                                         (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
@@ -2023,7 +2023,7 @@ static int processConfigurationFile(char *infile, struct Input *in)
                                 }
                                 else { /* Dimension */
                                     icount++;
-                                    if (icount > MAX_NUM_DIMENSION) {
+                                    if (icount >= MAX_NUM_DIMENSION) {
                                         (void) HDfprintf(stderr, "Invalid value for rank.\n");
                                         goto error;
                                     }
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index b279cf9..0567269 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -1422,9 +1422,9 @@ copy_user_block(const char *infile, const char *outfile, hsize_t size)
     } /* end while */
 
 done:
-    if (infid > 0)
+    if (infid >= 0)
         HDclose(infid);
-    if (outfid > 0)
+    if (outfid >= 0)
         HDclose(outfid);
 
     return ret_value;
@@ -1497,7 +1497,7 @@ print_user_block(const char *filename, hid_t fid)
     }
 
 done:
-    if (fh > 0)
+    if (fh >= 0)
         HDclose(fh);
 
     return;
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index 8f0178f..dec25f9 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -707,6 +707,8 @@ int main(int argc, const char **argv)
     void               *edata;
     void               *tools_edata;
 
+    HDmemset(&options, 0, sizeof(pack_opt_t));
+
     h5tools_setprogname(PROGRAMNAME);
     h5tools_setstatus(EXIT_SUCCESS);