TRILABS-81 coverity tools fixes

3 files changed, 54 insertions, 53 deletions

diff --git a/tools/perform/perf.c b/tools/perform/perf.c
index b421328..994615f 100644
--- a/tools/perform/perf.c
+++ b/tools/perform/perf.c
@@ -63,13 +63,13 @@
 #define H5FATAL 1
 #define VRFY(val, mesg, fatal) do {                                            \
     if (!val) {                                                                \
-  	printf("Proc %d: ", mynod);                 \
+        printf("Proc %d: ", mynod);                 \
         printf("*** Assertion failed (%s) at line %4d in %s\n",                \
-      mesg, (int)__LINE__, __FILE__);                  \
-  	if (fatal){                     \
-      fflush(stdout);                   \
-      goto die_jar_jar_die;                 \
-  	}                       \
+        mesg, (int)__LINE__, __FILE__);                  \
+        if (fatal){                     \
+            fflush(stdout);                   \
+            goto die_jar_jar_die;                 \
+        }                       \
     }                                                                          \
 } while(0)
 #define RANK 1
@@ -180,38 +180,38 @@ int main(int argc, char **argv)
 
     /* setup file access template with parallel IO access. */
     if (opt_split_vfd){
-  	hid_t mpio_pl;
-
-  	mpio_pl = H5Pcreate (H5P_FILE_ACCESS);
-  	VRFY((acc_tpl >= 0), "", H5FATAL);
-  	ret = H5Pset_fapl_mpio(mpio_pl, MPI_COMM_WORLD, MPI_INFO_NULL);
-  	VRFY((ret >= 0), "", H5FATAL);
-
-  	/* set optional allocation alignment */
-  	if (opt_alignment*opt_threshold != 1){
-      	ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
-      	VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
-  	}
-
-  	/* setup file access template */
-  	acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
-  	VRFY((acc_tpl >= 0), "", H5FATAL);
-  	ret = H5Pset_fapl_split(acc_tpl, meta_ext, mpio_pl, raw_ext, mpio_pl);
-  	VRFY((ret >= 0), "H5Pset_fapl_split succeeded", H5FATAL);
-  	ret = H5Pclose(mpio_pl);
-  	VRFY((ret >= 0), "H5Pclose mpio_pl succeeded", H5FATAL);
+    hid_t mpio_pl;
+
+    mpio_pl = H5Pcreate (H5P_FILE_ACCESS);
+    VRFY((acc_tpl >= 0), "", H5FATAL);
+    ret = H5Pset_fapl_mpio(mpio_pl, MPI_COMM_WORLD, MPI_INFO_NULL);
+    VRFY((ret >= 0), "", H5FATAL);
+
+    /* set optional allocation alignment */
+    if (opt_alignment*opt_threshold != 1){
+        ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
+        VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
+    }
+
+    /* setup file access template */
+    acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
+    VRFY((acc_tpl >= 0), "", H5FATAL);
+    ret = H5Pset_fapl_split(acc_tpl, meta_ext, mpio_pl, raw_ext, mpio_pl);
+    VRFY((ret >= 0), "H5Pset_fapl_split succeeded", H5FATAL);
+    ret = H5Pclose(mpio_pl);
+    VRFY((ret >= 0), "H5Pclose mpio_pl succeeded", H5FATAL);
     }else{
-  	/* setup file access template */
-  	acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
-  	VRFY((acc_tpl >= 0), "", H5FATAL);
-  	ret = H5Pset_fapl_mpio(acc_tpl, MPI_COMM_WORLD, MPI_INFO_NULL);
-  	VRFY((ret >= 0), "", H5FATAL);
-
-  	/* set optional allocation alignment */
-  	if (opt_alignment*opt_threshold != 1){
-  	    ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
-      	VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
-  	}
+    /* setup file access template */
+    acc_tpl = H5Pcreate (H5P_FILE_ACCESS);
+    VRFY((acc_tpl >= 0), "", H5FATAL);
+    ret = H5Pset_fapl_mpio(acc_tpl, MPI_COMM_WORLD, MPI_INFO_NULL);
+    VRFY((ret >= 0), "", H5FATAL);
+
+    /* set optional allocation alignment */
+    if (opt_alignment*opt_threshold != 1){
+        ret = H5Pset_alignment(acc_tpl, opt_threshold, opt_alignment );
+        VRFY((ret >= 0), "H5Pset_alignment succeeded", !H5FATAL);
+    }
     }
 
     h5_fixname_no_suffix(FILENAME[0], acc_tpl, filename, sizeof filename);
@@ -225,7 +225,7 @@ int main(int argc, char **argv)
     sid = H5Screate_simple(RANK, dims, NULL);
     VRFY((sid >= 0), "H5Screate_simple succeeded", H5FATAL);
     dataset = H5Dcreate2(fid, "Dataset1", H5T_NATIVE_CHAR, sid,
-      		H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+            H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     VRFY((dataset >= 0), "H5Dcreate2 succeeded", H5FATAL);
 
     /* create the memory dataspace and the file dataspace */
diff --git a/tools/perform/pio_perf.h b/tools/perform/pio_perf.h
index b595c90..7605f20 100644
--- a/tools/perform/pio_perf.h
+++ b/tools/perform/pio_perf.h
@@ -15,7 +15,6 @@
 
 #include "io_timer.h"
 #ifndef STANDALONE
-#include "H5private.h"
 #include "h5test.h"
 #include "h5tools.h"
 #include "h5tools_utils.h"
@@ -36,22 +35,22 @@ typedef enum iotype_ {
 } iotype;
 
 typedef struct parameters_ {
-    iotype	io_type;        /* The type of IO test to perform       */
-    int		num_procs;      /* Maximum number of processes to use   */
-    long	num_files;      /* Number of files to create            */
-    long	num_dsets;      /* Number of datasets to create         */
-    off_t	num_bytes;      /* Number of bytes in each dset         */
+    iotype    io_type;        /* The type of IO test to perform       */
+    int        num_procs;      /* Maximum number of processes to use   */
+    long    num_files;      /* Number of files to create            */
+    long    num_dsets;      /* Number of datasets to create         */
+    off_t    num_bytes;      /* Number of bytes in each dset         */
     int         num_iters;      /* Number of times to loop doing the IO */
-    size_t 	buf_size;       /* Buffer size                          */
-    size_t 	blk_size;       /* Block size                           */
+    size_t     buf_size;       /* Buffer size                          */
+    size_t     blk_size;       /* Block size                           */
     unsigned    interleaved;    /* Interleaved vs. contiguous blocks    */
     unsigned    collective;     /* Collective vs. independent I/O       */
     unsigned    dim2d;          /* 1D vs. 2D                            */
-    hsize_t 	h5_align;       /* HDF5 object alignment                */
-    hsize_t 	h5_thresh;      /* HDF5 object alignment threshold      */
-    int 	h5_use_chunks;  /* Make HDF5 dataset chunked            */
-    int    	h5_write_only;  /* Perform the write tests only         */
-    int 	verify;    	/* Verify data correctness              */
+    hsize_t     h5_align;       /* HDF5 object alignment                */
+    hsize_t     h5_thresh;      /* HDF5 object alignment threshold      */
+    int     h5_use_chunks;  /* Make HDF5 dataset chunked            */
+    int        h5_write_only;  /* Perform the write tests only         */
+    int     verify;        /* Verify data correctness              */
 } parameters;
 
 typedef struct results_ {
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c
index 0636d3b..e301bb3 100644
--- a/tools/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c
@@ -419,7 +419,9 @@ fill_with_random_data(Bytef *src, uLongf src_len)
             buf += rc;
             len -= (size_t)rc;
         }
-    } else {
+        HDclose(fd);
+    }
+    else {
         HDfprintf(stdout, "Using random() for random data\n");
 
         for (u = 0; u < src_len; ++u)
@@ -557,7 +559,7 @@ main(int argc, char **argv)
     int opt;
 
     prog = argv[0];
-    
+
     /* Initialize h5tools lib */
     h5tools_init();