TRILABS-81 coverity tools fixes

2 files changed, 152 insertions, 181 deletions

diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 1357952..55ae638 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -24,9 +24,9 @@
 /* Parameters to control statistics gathered */
 
 /* Default threshold for small groups/datasets/attributes */
-#define DEF_SIZE_SMALL_GROUPS       	10
-#define DEF_SIZE_SMALL_DSETS        	10
-#define DEF_SIZE_SMALL_ATTRS  		10
+#define DEF_SIZE_SMALL_GROUPS           10
+#define DEF_SIZE_SMALL_DSETS            10
+#define DEF_SIZE_SMALL_ATTRS            10
 
 #define  H5_NFILTERS_IMPL        8     /* Number of currently implemented filters + one to
                                           accommodate for user-define filters + one
@@ -72,7 +72,7 @@ typedef struct iter_t {
     hsize_t max_dset_dims;              /* Maximum dimension size of dataset */
     unsigned long *small_dset_dims;    /* Size of dimensions of small datasets tracked */
     unsigned long dset_layouts[H5D_NLAYOUTS];           /* Type of storage for each dataset */
-    unsigned long dset_comptype[H5_NFILTERS_IMPL]; 	/* Number of currently implemented filters */
+    unsigned long dset_comptype[H5_NFILTERS_IMPL];     /* Number of currently implemented filters */
     unsigned long dset_ntypes;          /* Number of diff. dataset datatypes found */
     dtype_info_t *dset_type_info;       /* Pointer to dataset datatype information found */
     unsigned dset_dim_nbins;            /* Number of bins for dataset dimensions */
@@ -114,9 +114,9 @@ static int        display_dset_metadata = FALSE;    /* display file space info f
 static int        display_object = FALSE;  /* not implemented yet */
 
 /* Initialize threshold for small groups/datasets/attributes */
-static int	  sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
-static int	  sdsets_threshold = DEF_SIZE_SMALL_DSETS;
-static int	  sattrs_threshold = DEF_SIZE_SMALL_ATTRS;
+static int      sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
+static int      sdsets_threshold = DEF_SIZE_SMALL_DSETS;
+static int      sattrs_threshold = DEF_SIZE_SMALL_ATTRS;
 
 /* a structure for handling the order command-line parameters come in */
 struct handler_t {
@@ -347,9 +347,8 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
  *
  * Purpose: Gather statistics about the group
  *
- * Return: Success: 0
- *
- *  Failure: -1
+ * Return:  Success: 0
+ *          Failure: -1
  *
  * Programmer: Quincey Koziol
  *             Tuesday, August 16, 2005
@@ -430,7 +429,6 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
  * Purpose: Gather statistics about the dataset
  *
  * Return:  Success: 0
- *
  *          Failure: -1
  *
  * Programmer:    Quincey Koziol
@@ -521,27 +519,27 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
 
     /* Only gather dim size statistics on 1-D datasets */
     if(ndims == 1) {
-	/* Determine maximum dimension size */
-	if(dims[0] > iter->max_dset_dims)
-	    iter->max_dset_dims = dims[0];
-	/* Collect statistics for small datasets */
-       if(dims[0] < (hsize_t)sdsets_threshold)
-           (iter->small_dset_dims[(size_t)dims[0]])++;
-
-       /* Add dim count to proper bin */
-       bin = ceil_log10((unsigned long)dims[0]);
-       if((bin + 1) > iter->dset_dim_nbins) {
-          /* Allocate more storage for info about dataset's datatype */
-          iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins, (bin + 1) * sizeof(unsigned long));
-          HDassert(iter->dset_dim_bins);
-
-          /* Initialize counts for intermediate bins */
-          while(iter->dset_dim_nbins < bin)
-              iter->dset_dim_bins[iter->dset_dim_nbins++] = 0;
-          iter->dset_dim_nbins++;
-
-          /* Initialize count for this bin */
-          iter->dset_dim_bins[bin] = 1;
+        /* Determine maximum dimension size */
+        if(dims[0] > iter->max_dset_dims)
+            iter->max_dset_dims = dims[0];
+        /* Collect statistics for small datasets */
+        if(dims[0] < (hsize_t)sdsets_threshold)
+            (iter->small_dset_dims[(size_t)dims[0]])++;
+
+        /* Add dim count to proper bin */
+        bin = ceil_log10((unsigned long)dims[0]);
+        if((bin + 1) > iter->dset_dim_nbins) {
+            /* Allocate more storage for info about dataset's datatype */
+            iter->dset_dim_bins = (unsigned long *)HDrealloc(iter->dset_dim_bins, (bin + 1) * sizeof(unsigned long));
+            HDassert(iter->dset_dim_bins);
+
+            /* Initialize counts for intermediate bins */
+            while(iter->dset_dim_nbins < bin)
+                iter->dset_dim_bins[iter->dset_dim_nbins++] = 0;
+            iter->dset_dim_nbins++;
+
+            /* Initialize count for this bin */
+            iter->dset_dim_bins[bin] = 1;
         } /* end if */
         else
             (iter->dset_dim_bins[bin])++;
@@ -560,6 +558,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
             type_found = TRUE;
             break;
         } /* end for */
+
     if(type_found)
          (iter->dset_type_info[u].count)++;
     else {
@@ -702,9 +701,8 @@ obj_stats(const char *path, const H5O_info_t *oi, const char *already_visited,
  *
  * Purpose: Gather statistics about a link
  *
- * Return: Success: 0
- *
- *  Failure: -1
+ * Return:  Success: 0
+ *          Failure: -1
  *
  * Programmer: Quincey Koziol
  *             Tuesday, November 6, 2007
@@ -822,14 +820,14 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'l':
-		if(opt_arg) {
-		    sgroups_threshold = HDatoi(opt_arg);
-		    if(sgroups_threshold < 1) {
-			error_msg("Invalid threshold for small groups\n");
-			goto error;
-		    }
-		} else
-		    error_msg("Missing threshold for small groups\n");
+                if(opt_arg) {
+                    sgroups_threshold = HDatoi(opt_arg);
+                    if(sgroups_threshold < 1) {
+                        error_msg("Invalid threshold for small groups\n");
+                        goto error;
+                    }
+                } else
+                    error_msg("Missing threshold for small groups\n");
 
                 break;
 
@@ -844,14 +842,14 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'm':
-		if(opt_arg) {
-		    sdsets_threshold = HDatoi(opt_arg);
-		    if(sdsets_threshold < 1) {
-			error_msg("Invalid threshold for small datasets\n");
-			goto error;
-		    }
-		} else
-		    error_msg("Missing threshold for small datasets\n");
+                if(opt_arg) {
+                    sdsets_threshold = HDatoi(opt_arg);
+                    if(sdsets_threshold < 1) {
+                        error_msg("Invalid threshold for small datasets\n");
+                        goto error;
+                    }
+                } else
+                    error_msg("Missing threshold for small datasets\n");
 
                 break;
 
@@ -866,13 +864,13 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'a':
-		if(opt_arg) {
-		    sattrs_threshold = HDatoi(opt_arg);
-		    if(sattrs_threshold < 1) {
-			error_msg("Invalid threshold for small # of attributes\n");
-			goto error;
-		    }
-		} else
+                if(opt_arg) {
+                    sattrs_threshold = HDatoi(opt_arg);
+                    if(sattrs_threshold < 1) {
+                        error_msg("Invalid threshold for small # of attributes\n");
+                        goto error;
+                    }
+                } else
                     error_msg("Missing threshold for small # of attributes\n");
 
                 break;
@@ -1143,9 +1141,8 @@ print_group_info(const iter_t *iter)
  *
  * Purpose: Prints file space information for groups' metadata
  *
- * Return: Success: 0
- *
- * Failure: Never fails
+ * Return:  Success: 0
+ *          Failure: Never fails
  *
  * Programmer: Vailin Choi; October 2009
  *
@@ -1171,9 +1168,8 @@ print_group_metadata(const iter_t *iter)
  *
  * Purpose: Prints information about datasets in the file
  *
- * Return: Success: 0
- *
- * Failure: Never fails
+ * Return:  Success: 0
+ *          Failure: Never fails
  *
  * Programmer: Elena Pourmal
  *             Saturday, August 12, 2006
@@ -1234,7 +1230,7 @@ print_dataset_info(const iter_t *iter)
 
         printf("Dataset layout information:\n");
         for(u = 0; u < H5D_NLAYOUTS; u++)
-        printf("\tDataset layout counts[%s]: %lu\n", (u == 0 ? "COMPACT" :
+            printf("\tDataset layout counts[%s]: %lu\n", (u == 0 ? "COMPACT" :
                 (u == 1 ? "CONTIG" : "CHUNKED")), iter->dset_layouts[u]);
         printf("\tNumber of external files : %lu\n", iter->nexternal);
 
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index 6031808..fda8ac4 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -14,7 +14,7 @@
 /*
  * Generate the binary hdf5 files for the h5stat tests.
  * Usage: just execute the program without any arguments will
- * generate all the binary hdf5 files 
+ * generate all the binary hdf5 files
  *
  * If you regenerate the test files (e.g., changing some code,
  * trying it on a new platform, ...), you need to verify the correctness
@@ -23,26 +23,26 @@
 #include "hdf5.h"
 
 /* For gen_newgrat_file() */
-#define NEWGRAT_FILE 	"h5stat_newgrat.h5"
-#define DATASET_NAME	"DATASET_NAME"
-#define GROUP_NAME	"GROUP"
-#define ATTR_NAME	"ATTR"
-#define NUM_GRPS 	35000
-#define NUM_ATTRS	100
+#define NEWGRAT_FILE     "h5stat_newgrat.h5"
+#define DATASET_NAME    "DATASET_NAME"
+#define GROUP_NAME    "GROUP"
+#define ATTR_NAME    "ATTR"
+#define NUM_GRPS     35000
+#define NUM_ATTRS    100
 
 /* For gen_threshold_file() */
-#define THRESHOLD_FILE 		"h5stat_threshold.h5"
-#define THRES_ATTR_NAME		"attr"
-#define THRES_ATTR_GRP_NAME	"grp_attr"
-#define THRES_DSET_NAME 	"dset"
-#define THRES_NUM		10
-#define THRES_NUM_25		25
+#define THRESHOLD_FILE         "h5stat_threshold.h5"
+#define THRES_ATTR_NAME        "attr"
+#define THRES_ATTR_GRP_NAME    "grp_attr"
+#define THRES_DSET_NAME     "dset"
+#define THRES_NUM        10
+#define THRES_NUM_25        25
 
 /*
  * Generate HDF5 file with latest format with
  * NUM_GRPS groups and NUM_ATTRS attributes for the dataset
  */
-static void 
+static void
 gen_newgrat_file(const char *fname)
 {
     hid_t fapl          = -1;   /* File access property */
@@ -52,65 +52,57 @@ gen_newgrat_file(const char *fname)
     hid_t sid           = -1;   /* Dataspace id */
     hid_t attr_id       = -1;   /* Attribute id */
     hid_t did           = -1;   /* Dataset id */
-    char name[30];	/* Group name */
-    char attrname[30];	/* Attribute name */
-    int  i;		/* Local index variable */
+    char name[30];    /* Group name */
+    char attrname[30];    /* Attribute name */
+    int  i;        /* Local index variable */
 
     /* Get a copy file access property list */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-	goto error;
+        goto error;
 
     /* Set to use latest library format */
     if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-	goto error;
+        goto error;
 
      /* Create file */
     if((fid = H5Fcreate(NEWGRAT_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+        goto error;
 
     /* Create NUM_GRPS groups in the root group */
     for(i = 1; i <= NUM_GRPS; i++) {
         sprintf(name, "%s%d", GROUP_NAME,i);
         if((gid = H5Gcreate2(fid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+            goto error;
         if(H5Gclose(gid) < 0)
-	    goto error;
+            goto error;
     } /* end for */
 
     /* Create a datatype to commit and use */
     if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0)
-	goto error;
+        goto error;
 
     /* Create dataspace for dataset */
     if((sid = H5Screate(H5S_SCALAR)) < 0)
-	goto error;
+        goto error;
 
     /* Create dataset */
     if((did = H5Dcreate2(fid, DATASET_NAME, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create NUM_ATTRS for the dataset */
     for(i = 1; i <= NUM_ATTRS; i++) {
         sprintf(attrname, "%s%d", ATTR_NAME,i);
         if((attr_id = H5Acreate2(did, attrname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+            goto error;
         if(H5Aclose(attr_id) < 0)
-	    goto error;
+            goto error;
     } /* end for */
 
     /* Close dataset, dataspace, datatype, file */
-    if(H5Dclose(did) < 0)
-	goto error;
-    if(H5Sclose(sid) < 0)
-	goto error;
-    if(H5Tclose(tid) < 0)
-	goto error;
-    if(H5Fclose(fid) < 0)
-	goto error;
-
 error:
     H5E_BEGIN_TRY {
-	H5Aclose(attr_id);
+        H5Pclose(fapl);
+        H5Aclose(attr_id);
         H5Dclose(did);
         H5Tclose(tid);
         H5Sclose(sid);
@@ -121,192 +113,175 @@ error:
 
 /*
  * Generate an HDF5 file with groups, datasets, attributes for testing the options:
- *	-l N (--links=N): Set the threshold for # of links when printing information for small groups.
- *	-m N (--dims=N): Set the threshold for the # of dimension sizes when printing information for small datasets.
- *	-a N (--numattrs=N): Set the threshold for the # of attributes when printing information for small # of attributes.
+ *    -l N (--links=N): Set the threshold for # of links when printing information for small groups.
+ *    -m N (--dims=N): Set the threshold for the # of dimension sizes when printing information for small datasets.
+ *    -a N (--numattrs=N): Set the threshold for the # of attributes when printing information for small # of attributes.
  */
 static void
 gen_threshold_file(const char *fname)
 {
-    hid_t fid;				/* File ID */
-    hid_t sid0, sid1, sid2, sid3, sid4;	/* Dataspace IDs */
-    hid_t did;				/* Dataset ID */
-    hid_t attr_id;			/* Attribute ID */
-    hid_t gid;				/* Group ID */
-    hsize_t two_dims[] = {2, 5};	/* Dimension array */
-    hsize_t one_dims[] = {6};		/* Dimension array */
-    hsize_t zero_dims[] = {0};		/* Dimension array */
-    char name[30];			/* Name */
-    unsigned i;				/* Local index variable */
+    hid_t fid  = -1;                /* File ID */
+    hid_t sid0 = -1;                /* Dataspace IDs */
+    hid_t sid1 = -1;                /* Dataspace IDs */
+    hid_t sid2 = -1;                /* Dataspace IDs */
+    hid_t sid3 = -1;                /* Dataspace IDs */
+    hid_t sid4 = -1;                /* Dataspace IDs */
+    hid_t did  = -1;                /* Dataset ID */
+    hid_t attr_id = -1;             /* Attribute ID */
+    hid_t gid = -1;                 /* Group ID */
+    hsize_t two_dims[] = {2, 5};    /* Dimension array */
+    hsize_t one_dims[] = {6};       /* Dimension array */
+    hsize_t zero_dims[] = {0};      /* Dimension array */
+    char name[30];                  /* Name */
+    unsigned i;                     /* Local index variable */
 
     /* Create file */
     if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create 1-D dataspace with zero dimension size */
     if((sid0 = H5Screate_simple(1, zero_dims, NULL)) < 0)
-	goto error;
+        goto error;
 
     /* Create 1-D dataspace with non-zero dimension size*/
     if((sid1 = H5Screate_simple(1, one_dims, NULL)) < 0)
-	goto error;
+        goto error;
 
     /* Create 2-D dataspace */
     if((sid2 = H5Screate_simple(2, two_dims, NULL)) < 0)
-	goto error;
+        goto error;
 
     /* Create scalar dataspace */
     if((sid3 = H5Screate(H5S_SCALAR)) < 0)
-	goto error;
+        goto error;
 
     /* Create null dataspace */
     if((sid4 = H5Screate(H5S_NULL)) < 0)
-	goto error;
+        goto error;
 
     /* Create an attribute for the root group */
     if((attr_id = H5Acreate2(fid, "attr", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
     if(H5Aclose(attr_id) < 0)
-	goto error;
+        goto error;
 
     /* Create 1-D dataset with zero dimension size for the root group */
     if((did = H5Dcreate2(fid, "zero_dset", H5T_NATIVE_UCHAR, sid0, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create 11 attributes for the dataset */
     for(i = 1; i <= (THRES_NUM+1); i++) {
         sprintf(name, "%s%d", THRES_ATTR_NAME,i);
         if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+            goto error;
         if(H5Aclose(attr_id) < 0)
-	    goto error;
+            goto error;
     }
     if(H5Dclose(did) < 0)
-	goto error;
+        goto error;
 
     /* Create dataset with scalar dataspace for the root group */
     if((did = H5Dcreate2(fid, "scalar_dset", H5T_NATIVE_UCHAR, sid3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
     if(H5Dclose(did) < 0)
-	goto error;
+        goto error;
 
     /* Create dataset with null dataspace for the root group */
     if((did = H5Dcreate2(fid, "null_dset", H5T_NATIVE_UCHAR, sid4, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
     if(H5Dclose(did) < 0)
-	goto error;
+        goto error;
 
     /* Create 2-D dataset for the root group */
     if((did = H5Dcreate2(fid, "dset", H5T_NATIVE_UCHAR, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create 10 attributes for the 2-D dataset */
     for(i = 1; i <= THRES_NUM; i++) {
         sprintf(name, "%s%d", THRES_ATTR_NAME,i);
         if((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+            goto error;
         if(H5Aclose(attr_id) < 0)
-	    goto error;
+            goto error;
     }
     if(H5Dclose(did) < 0)
-	goto error;
+        goto error;
 
     /* Create first group */
     if((gid = H5Gcreate2(fid, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create an attribute for the group */
     if((attr_id = H5Acreate2(gid, "ATTR", H5T_NATIVE_INT, sid3, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Close attribute */
     if(H5Aclose(attr_id) < 0)
-	goto error;
+        goto error;
 
     /* Create 10 1-D datasets with non-zero dimension size for the group */
     for(i = 1; i <= THRES_NUM; i++) {
-	/* set up dataset name */
+        /* set up dataset name */
         sprintf(name, "%s%d", THRES_DSET_NAME,i);
 
-	/* Create the dataset */
-	if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+        /* Create the dataset */
+        if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto error;
 
-	/* Close the dataset */
+        /* Close the dataset */
         if(H5Dclose(did) < 0)
-	    goto error;
+            goto error;
     }
 
     /* Close the group */
     if(H5Gclose(gid) < 0)
-	goto error;
+        goto error;
 
 
     /* Create second group */
     if((gid = H5Gcreate2(fid, "group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create 25 attributes for the group */
     for(i = 1; i <= THRES_NUM_25; i++) {
-	/* Set up attribute name */
+    /* Set up attribute name */
         sprintf(name, "%s%d", THRES_ATTR_GRP_NAME,i);
 
-	/* Create the attribute */
+        /* Create the attribute */
         if((attr_id = H5Acreate2(gid, name, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+            goto error;
 
-	/* Close the attribute */
+        /* Close the attribute */
         if(H5Aclose(attr_id) < 0)
-	    goto error;
+            goto error;
     }
 
     /* Close the group */
     if(H5Gclose(gid) < 0)
-	goto error;
+        goto error;
 
     /* Create third group */
     if((gid = H5Gcreate2(fid, "group3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
 
     /* Create 9 1-D datasets with non-zero dimension size for the group */
     for(i = 1; i < THRES_NUM; i++) {
-	/* set up dataset name */
+        /* set up dataset name */
         sprintf(name, "%s%d", THRES_DSET_NAME,i);
 
-	/* Create the dataset */
-	if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-	    goto error;
+        /* Create the dataset */
+        if((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto error;
 
-	/* Close the dataset */
+        /* Close the dataset */
         if(H5Dclose(did) < 0)
-	    goto error;
+            goto error;
     }
 
-    /* Close the group */
-    if(H5Gclose(gid) < 0)
-	goto error;
-
-
-    /* Close dataspaces */
-    if(H5Sclose(sid0) < 0)
-	goto error;
-    if(H5Sclose(sid1) < 0)
-	goto error;
-    if(H5Sclose(sid2) < 0)
-	goto error;
-    if(H5Sclose(sid3) < 0)
-	goto error;
-    if(H5Sclose(sid4) < 0)
-	goto error;
-
-    /* Close file */
-    if(H5Fclose(fid) < 0)
-	goto error;
-
 error:
     H5E_BEGIN_TRY {
         H5Gclose(gid);
-	H5Aclose(attr_id);
+        H5Aclose(attr_id);
         H5Dclose(did);
         H5Sclose(sid0);
         H5Sclose(sid1);