Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol

1 files changed, 134 insertions, 178 deletions

diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index 2daf24b..ae11032 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/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
@@ -24,25 +24,25 @@
 #include "H5private.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
 
 /* Declarations for gen_idx_file() */
-#define IDX_FILE 	"h5stat_idx.h5"
-#define DSET		"dset"
-#define DSET_FILTER	"dset_filter"
+#define IDX_FILE     "h5stat_idx.h5"
+#define DSET        "dset"
+#define DSET_FILTER    "dset_filter"
 
 /* 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
 
 /* For gen_err_refcount() */
 #define ERR_REFCOUNT_FILE   "h5stat_err_refcount.h5"
@@ -51,7 +51,7 @@
  * 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 fcpl          = -1;   /* File creation property */
@@ -62,79 +62,66 @@ 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;
 
     /* Get a copy of file creation property list */
     if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
-	goto error;
+        goto error;
 
     /* Set file space handling strategy */
     if(H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, 1, (hsize_t)1) < 0)
-	goto error;
+        goto error;
 
      /* Create file */
     if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, 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(H5Pclose(fapl) < 0)
-	goto error;
-    if(H5Pclose(fcpl) < 0)
-	goto error;
-    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 {
-	H5Pclose(fapl);
-	H5Pclose(fcpl);
-	H5Aclose(attr_id);
+        H5Pclose(fapl);
+        H5Pclose(fcpl);
+        H5Aclose(attr_id);
         H5Dclose(did);
         H5Tclose(tid);
         H5Sclose(sid);
@@ -145,192 +132,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);
@@ -346,84 +316,73 @@ error:
  * Function: gen_idx_file
  *
  * Purpose: Create a file with datasets that use Fixed Array indexing:
- *   	one dataset: fixed dimension, chunked layout, w/o filters
- *     	one dataset: fixed dimension, chunked layout, w/ filters
+ *       one dataset: fixed dimension, chunked layout, w/o filters
+ *         one dataset: fixed dimension, chunked layout, w/ filters
  *
  */
-static void 
+static void
 gen_idx_file(const char *fname)
 {
-    hid_t	fapl = -1;		    /* file access property id */
-    hid_t	fid = -1;	            /* file id */
-    hid_t   	sid = -1;	            /* space id */
-    hid_t	dcpl = -1;	    	    /* dataset creation property id */
-    hid_t	did = -1, did2 = -1;	    /* dataset id */
-    hsize_t 	dims[1] = {10};     /* dataset dimension */
-    hsize_t 	c_dims[1] = {2};    /* chunk dimension */
-    int		i;		    /* local index variable */
-    int     	buf[10];            /* data buffer */
+    hid_t    fapl = -1;            /* file access property id */
+    hid_t    fid = -1;                /* file id */
+    hid_t    sid = -1;                /* space id */
+    hid_t    dcpl = -1;                /* dataset creation property id */
+    hid_t    did = -1, did2 = -1;        /* dataset id */
+    hsize_t  dims[1] = {10};     /* dataset dimension */
+    hsize_t  c_dims[1] = {2};    /* chunk dimension */
+    int      i;            /* local index variable */
+    int      buf[10];            /* data buffer */
 
     /* Get a copy of the file access property */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0)
-	goto error;
+        goto error;
 
     /* Set the "use the latest format" bounds for creating objects in the file */
     if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
-	goto error;
+        goto error;
 
     /* Create file */
     if((fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
-	goto error;
+        goto error;
 
     /* Create data */
     for(i = 0; i < 10; i++)
-	buf[i] = i;
+        buf[i] = i;
 
     /* Set chunk */
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-	goto error;
+        goto error;
 
     if(H5Pset_chunk(dcpl, 1, c_dims) < 0)
-	goto error;
+        goto error;
 
     /* Create a 1D dataset */
     if((sid = H5Screate_simple(1, dims, NULL)) < 0)
-	goto error;
+        goto error;
     if((did  = H5Dcreate2(fid, DSET, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	goto error;
-    
+        goto error;
+
     /* Write to the dataset */
     if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-	goto error;
+        goto error;
 
 #if defined (H5_HAVE_FILTER_DEFLATE)
     /* set deflate data */
     if(H5Pset_deflate(dcpl, 9) < 0)
-	goto error;
+        goto error;
 
     /* Create and write the dataset */
     if((did2  = H5Dcreate2(fid, DSET_FILTER, H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
-	goto error;
+        goto error;
     if(H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
-	goto error;
+        goto error;
 
     /* Close the dataset */
     if(H5Dclose(did2) < 0)
-	goto error;
+        goto error;
 #endif
 
     /* closing: dataspace, dataset, file */
-    if(H5Pclose(fapl) < 0)
-	goto error;
-    if(H5Pclose(dcpl) < 0)
-	goto error;
-    if(H5Sclose(sid) < 0)
-	goto error;
-    if(H5Dclose(did) < 0)
-	goto error;
-    if(H5Fclose(fid) < 0)
-	goto error;
-
 error:
     H5E_BEGIN_TRY {
         H5Pclose(fapl);
@@ -451,7 +410,7 @@ error:
  *          H5O_refcount_decode in the jira issue.
  *
  */
-static void 
+static void
 gen_err_refcount(const char *fname)
 {
     hid_t fid = -1;     /* File identifier */
@@ -525,16 +484,13 @@ gen_err_refcount(const char *fname)
     /* Offset of the message ID to modify is as follows: */
     /* 4520: the offset of the object header containing the attribute message
              with the committed datatype */
-    /* 24: the offset in the object header containing the version of the 
+    /* 24: the offset in the object header containing the version of the
            attribute message */
-    if((fd = HDopen(fname, O_RDWR, 0633)) < 0)
-        goto error;
-    if(HDlseek(fd, 4520+24, SEEK_SET) < 0)
-        goto error;
-    if(HDwrite(fd, &val, 2) < 0)
-        goto error;
-    if(HDclose(fd) < 0)
-        goto error;
+    if((fd = HDopen(fname, O_RDWR, 0633)) >= 0) {
+        HDlseek(fd, 4520+24, SEEK_SET);
+        HDwrite(fd, &val, 2);
+        HDclose(fd);
+    }
 
 error:
     H5E_BEGIN_TRY {
@@ -548,8 +504,8 @@ error:
     } H5E_END_TRY;
 } /* gen_err_refcount() */
 
-/* 
- * The following two test files are generated with older versions 
+/*
+ * The following two test files are generated with older versions
  * of the library for HDFFV-10333.  They are used for testing in
  * testh5stat.sh.in.
  *
@@ -559,7 +515,7 @@ error:
  *     Then a "0" is written to the "dimension" field in the layout
  *     message to trigger the error.
  *     This is to verify HDFFV-10333 that h5stat will exit gracefully
- *     when encountered error similar to H5O__layout_decode in the 
+ *     when encountered error similar to H5O__layout_decode in the
  *     jira issue.
  *
  * (2) h5stat_err_old_fill.h5
@@ -568,7 +524,7 @@ error:
  *     Then an illegal size is written to the "size" fild in the
  *     fill value message to trigger the error.
  *     This is to verify HDFFV-10333 that h5stat will exit gracefully
- *     when encountered error similar to H5O_fill_old_decode in the 
+ *     when encountered error similar to H5O_fill_old_decode in the
  *     jira issue.
  */