From f698c360f567e9094050b699dfa4721dc1852a68 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Mon, 12 Mar 2012 16:45:38 -0500
Subject: [svn-r22053] Description:     Correct corner case for creating a
 contiguous dataset with a zero-sized dataspace, when the allocation time is
 set to early.

    Also clean up a few compiler warnings in the dataspace code.

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug & parallel
---
 src/H5Dcontig.c |   7 +-
 src/H5S.c       |   9 +-
 test/th5s.c     | 966 +++++++++++++++++++++++++++++---------------------------
 3 files changed, 506 insertions(+), 476 deletions(-)

diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 674582d..bb10b77 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -494,8 +494,11 @@ H5D_contig_is_space_alloc(const H5O_storage_t *storage)
     /* Sanity checks */
     HDassert(storage);
 
-    /* Set return value */
-    ret_value = (hbool_t)H5F_addr_defined(storage->u.contig.addr);
+    /* Set return value, indicating space is allocated when size is zero */
+    if(0 == storage->u.contig.size)
+        ret_value = TRUE;
+    else
+        ret_value = (hbool_t)H5F_addr_defined(storage->u.contig.addr);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D_contig_is_space_alloc() */
diff --git a/src/H5S.c b/src/H5S.c
index 59f3085..5d99066 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -86,7 +86,7 @@ H5S_init_interface(void)
         /* Allow MPI buf-and-file-type optimizations? */
         const char *s = HDgetenv ("HDF5_MPI_OPT_TYPES");
         if (s && HDisdigit(*s))
-            H5S_mpi_opt_types_g = (int)HDstrtol (s, NULL, 0);
+            H5S_mpi_opt_types_g = (hbool_t)HDstrtol (s, NULL, 0);
     }
 #endif /* H5_HAVE_PARALLEL */
 
@@ -186,6 +186,7 @@ H5S_create(H5S_class_t type)
             new_ds->extent.nelem = 0;
             break;
 
+        case H5S_NO_CLASS:
         default:
             HDassert("unknown dataspace (extent) type" && 0);
             break;
@@ -512,6 +513,7 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max)
                 dst->max = NULL;
             break;
 
+        case H5S_NO_CLASS:
         default:
             HDassert("unknown dataspace type" && 0);
             break;
@@ -712,6 +714,7 @@ H5S_get_npoints_max(const H5S_t *ds)
             }
             break;
 
+        case H5S_NO_CLASS:
         default:
             assert("unknown dataspace class" && 0);
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, 0, "internal error (unknown dataspace class)")
@@ -796,6 +799,7 @@ H5S_get_simple_extent_ndims(const H5S_t *ds)
             ret_value = (int)ds->extent.rank;
             break;
 
+        case H5S_NO_CLASS:
         default:
             HDassert("unknown dataspace class" && 0);
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "internal error (unknown dataspace class)")
@@ -894,6 +898,7 @@ H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t max_dims[])
             } /* end for */
             break;
 
+        case H5S_NO_CLASS:
         default:
             HDassert("unknown dataspace class" && 0);
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "internal error (unknown dataspace class)")
@@ -1827,7 +1832,7 @@ H5S_set_extent(H5S_t *space, const hsize_t *size)
             /* Check for invalid dimension size modification */
             if(space->extent.max && H5S_UNLIMITED != space->extent.max[u] &&
                      space->extent.max[u] < size[u])
-                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "dimension cannot exceed the existing maximal size")
+                 HGOTO_ERROR(H5E_DATASPACE, H5E_BADVALUE, FAIL, "dimension cannot exceed the existing maximal size (new: %llu max: %llu)", (unsigned long long)size[u], (unsigned long long)space->extent.max[u])
 
             /* Indicate that dimension size can be modified */
             ret_value = TRUE;
diff --git a/test/th5s.c b/test/th5s.c
index c17d96e..87aa0f1 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -544,70 +544,13 @@ test_h5s_zero_dim(void)
     hssize_t            nelem;          /* Number of elements           */
     H5S_sel_type        sel_type;       /* Type of selection currently  */
     H5S_class_t         stype;          /* dataspace type               */
+    H5D_alloc_time_t    alloc_time;     /* Space allocation time        */
     herr_t		ret;		/* Generic return value	        */
     unsigned int        i, j, k;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Dataspace with zero dimension size\n"));
 
-    /* Make sure we can create the space with the dimension size 0 (starting from v1.8.7).
-     * The dimension doesn't need to be unlimited. */
-    sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
-    CHECK(sid1, FAIL, "H5Screate_simple");
-
-    ret = H5Sclose(sid1);
-    CHECK(ret, FAIL, "H5Sclose");
-
-    sid1 = H5Screate(H5S_SIMPLE);
-    CHECK(sid1, FAIL, "H5Screate");
-
-    /* SID1 has the 1st dimension size as zero.  The maximal dimension will be
-     * the same as the dimension because of the NULL passed in. */
-    ret = H5Sset_extent_simple(sid1,SPACE1_RANK,dims1,NULL);
-    CHECK(ret, FAIL, "H5Sset_extent_simple");
-
-    /* Check that the dataspace actually has 0 elements */
-    nelem = H5Sget_simple_extent_npoints(sid1);
-    VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
-
-    /* Check that the dataspace was created with an "all" selection */
-    sel_type = H5Sget_select_type(sid1);
-    VERIFY(sel_type, H5S_SEL_ALL, "H5Sget_select_type");
-
-    /* Check that the dataspace has 0 elements selected */
-    nelem = H5Sget_select_npoints(sid1);
-    VERIFY(nelem, 0, "H5Sget_select_npoints");
-
-    /* Change to "none" selection */
-    ret = H5Sselect_none(sid1);
-    CHECK(ret, FAIL, "H5Sselect_none");
-
-    /* Check that the dataspace has 0 elements selected */
-    nelem = H5Sget_select_npoints(sid1);
-    VERIFY(nelem, 0, "H5Sget_select_npoints");
-
-    /* Try to select all dataspace */
-    ret = H5Sselect_all(sid1);
-    CHECK(ret, FAIL, "H5Sselect_all");
-
-    /* Check that the dataspace has 0 elements selected */
-    nelem = H5Sget_select_npoints(sid1);
-    VERIFY(nelem, 0, "H5Sget_select_npoints");
-
-    /* Create the dataspace for chunked dataset with the first dimension size as zero.
-     * The maximal dimensions are bigger than the dimensions for later expansion. */
-    sid_chunk = H5Screate_simple(SPACE1_RANK, dims1, max_dims);
-    CHECK(sid_chunk, FAIL, "H5Screate_simple");
-
-    /*============================================
-     * Make sure we can use 0-dimension to create 
-     * contiguous, chunked, compact, and external 
-     * datasets, and also attribute.
-     *============================================
-     */
-    fid1 = H5Fcreate(ZEROFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    CHECK(fid1, FAIL, "H5Fcreate");
-
     /* Initialize the data */
     for(i=0; i<SPACE1_DIM2; i++)
         for(j=0; j<SPACE1_DIM3; j++) {
@@ -622,509 +565,588 @@ test_h5s_zero_dim(void)
             for(k=0; k<SPACE1_DIM3; k++)
                 wdata_real[i][j][k] = i + j + k;
 
-
-    /*===================== Contiguous dataset =======================*/
-    dset1 = H5Dcreate2(fid1, BASICDATASET, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    CHECK(dset1, FAIL, "H5Dcreate2");
-
-    /* Write "nothing" to the dataset */
-    ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, wdata);
-    CHECK(ret, FAIL, "H5Dwrite");
-
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
-
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, rdata);
-    CHECK(ret, FAIL, "H5Dread");
-
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
+    /* Test with different space allocation times */
+    for(alloc_time = H5D_ALLOC_TIME_EARLY; alloc_time <= H5D_ALLOC_TIME_INCR; alloc_time++) {
+
+        /* Make sure we can create the space with the dimension size 0 (starting from v1.8.7).
+         * The dimension doesn't need to be unlimited. */
+        dims1[0] = 0;
+        dims1[1] = SPACE1_DIM2;
+        dims1[2] = SPACE1_DIM3;
+        sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
+        CHECK(sid1, FAIL, "H5Screate_simple");
+
+        ret = H5Sclose(sid1);
+        CHECK(ret, FAIL, "H5Sclose");
+
+        sid1 = H5Screate(H5S_SIMPLE);
+        CHECK(sid1, FAIL, "H5Screate");
+
+        /* SID1 has the 1st dimension size as zero.  The maximal dimension will be
+         * the same as the dimension because of the NULL passed in. */
+        ret = H5Sset_extent_simple(sid1,SPACE1_RANK,dims1,NULL);
+        CHECK(ret, FAIL, "H5Sset_extent_simple");
+
+        /* Check that the dataspace actually has 0 elements */
+        nelem = H5Sget_simple_extent_npoints(sid1);
+        VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
+
+        /* Check that the dataspace was created with an "all" selection */
+        sel_type = H5Sget_select_type(sid1);
+        VERIFY(sel_type, H5S_SEL_ALL, "H5Sget_select_type");
+
+        /* Check that the dataspace has 0 elements selected */
+        nelem = H5Sget_select_npoints(sid1);
+        VERIFY(nelem, 0, "H5Sget_select_npoints");
+
+        /* Change to "none" selection */
+        ret = H5Sselect_none(sid1);
+        CHECK(ret, FAIL, "H5Sselect_none");
+
+        /* Check that the dataspace has 0 elements selected */
+        nelem = H5Sget_select_npoints(sid1);
+        VERIFY(nelem, 0, "H5Sget_select_npoints");
+
+        /* Try to select all dataspace */
+        ret = H5Sselect_all(sid1);
+        CHECK(ret, FAIL, "H5Sselect_all");
+
+        /* Check that the dataspace has 0 elements selected */
+        nelem = H5Sget_select_npoints(sid1);
+        VERIFY(nelem, 0, "H5Sget_select_npoints");
+
+        /* Create the dataspace for chunked dataset with the first dimension size as zero.
+         * The maximal dimensions are bigger than the dimensions for later expansion. */
+        sid_chunk = H5Screate_simple(SPACE1_RANK, dims1, max_dims);
+        CHECK(sid_chunk, FAIL, "H5Screate_simple");
+
+        /*============================================
+         * Make sure we can use 0-dimension to create 
+         * contiguous, chunked, compact, and external 
+         * datasets, and also attribute.
+         *============================================
+         */
+        fid1 = H5Fcreate(ZEROFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK(fid1, FAIL, "H5Fcreate");
+
+        /*===================== Contiguous dataset =======================*/
+        plist_id = H5Pcreate(H5P_DATASET_CREATE);
+        CHECK(plist_id, FAIL, "H5Pcreate");
+
+        ret = H5Pset_alloc_time(plist_id, alloc_time);
+        CHECK(ret, FAIL, "H5Pset_alloc_time");
+
+        dset1 = H5Dcreate2(fid1, BASICDATASET, H5T_NATIVE_INT, sid1, H5P_DEFAULT, plist_id, H5P_DEFAULT);
+        CHECK(dset1, FAIL, "H5Dcreate2");
+
+        ret = H5Pclose(plist_id);
+        CHECK(ret, FAIL, "H5Pclose");
+
+        /* Write "nothing" to the dataset */
+        ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, wdata);
+        CHECK(ret, FAIL, "H5Dwrite");
+
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
+
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, rdata);
+        CHECK(ret, FAIL, "H5Dread");
+
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
+                }
             }
         }
-    }
 
-    /* Write "nothing" to the dataset (with type conversion :-) */
-    ret = H5Dwrite(dset1, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata_short);
-    CHECK(ret, FAIL, "H5Dwrite");
+        /* Write "nothing" to the dataset (with type conversion :-) */
+        ret = H5Dwrite(dset1, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata_short);
+        CHECK(ret, FAIL, "H5Dwrite");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, rdata_short);
-    CHECK(ret, FAIL, "H5Dread");
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, rdata_short);
+        CHECK(ret, FAIL, "H5Dread");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata_short[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata_short[i][j]);
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata_short[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata_short[i][j]);
+                }
             }
         }
-    }
-
-    /* Select a hyperslab beyond its current dimension sizes, then try to write 
-     * the data.  It should fail. */
-    ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL);
-    CHECK(ret, FAIL, "H5Sselect_hyperslab");
-
-    H5E_BEGIN_TRY {
-        ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, wdata);
-    } H5E_END_TRY;
-    VERIFY(ret, FAIL, "H5Dwrite");
-
-    /* Change to "none" selection */
-    ret = H5Sselect_none(sid1);
-    CHECK(ret, FAIL, "H5Sselect_none");
-
-    /* Select a point beyond the dimension size, then try to write the data. 
-     * It should fail. */
-    coord[0][0]=2; coord[0][1]=5; coord[0][2]=3;
-    ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord);
-    CHECK(ret, FAIL, "H5Sselect_elements");
 
-    H5E_BEGIN_TRY {
-        ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &val);
-    } H5E_END_TRY;
-    VERIFY(ret, FAIL, "H5Dwrite");
+        /* Select a hyperslab beyond its current dimension sizes, then try to write 
+         * the data.  It should fail. */
+        ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, NULL, count, NULL);
+        CHECK(ret, FAIL, "H5Sselect_hyperslab");
 
-    /* Restore the selection to all */
-    ret = H5Sselect_all(sid1);
-    CHECK(ret, FAIL, "H5Sselect_all");
+        H5E_BEGIN_TRY {
+            ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, wdata);
+        } H5E_END_TRY;
+        VERIFY(ret, FAIL, "H5Dwrite");
 
-    ret = H5Dclose(dset1);
-    CHECK(ret, FAIL, "H5Dclose");
+        /* Change to "none" selection */
+        ret = H5Sselect_none(sid1);
+        CHECK(ret, FAIL, "H5Sselect_none");
 
-    /*=================== Chunked dataset ====================*/
-    plist_id = H5Pcreate(H5P_DATASET_CREATE);
-    CHECK(plist_id, FAIL, "H5Pcreate");
+        /* Select a point beyond the dimension size, then try to write the data. 
+         * It should fail. */
+        coord[0][0]=2; coord[0][1]=5; coord[0][2]=3;
+        ret = H5Sselect_elements(sid1, H5S_SELECT_SET, (size_t)1, (const hsize_t *)coord);
+        CHECK(ret, FAIL, "H5Sselect_elements");
 
-    ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
-    CHECK(ret, FAIL, "H5Pset_chunk");
+        H5E_BEGIN_TRY {
+            ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, sid1, H5P_DEFAULT, &val);
+        } H5E_END_TRY;
+        VERIFY(ret, FAIL, "H5Dwrite");
 
-    dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
-    CHECK(dset1, FAIL, "H5Dcreate2");
+        /* Restore the selection to all */
+        ret = H5Sselect_all(sid1);
+        CHECK(ret, FAIL, "H5Sselect_all");
 
-    /* Write "nothing" to the dataset */
-    ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    CHECK(ret, FAIL, "H5Dwrite");
+        ret = H5Dclose(dset1);
+        CHECK(ret, FAIL, "H5Dclose");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        /*=================== Chunked dataset ====================*/
+        plist_id = H5Pcreate(H5P_DATASET_CREATE);
+        CHECK(plist_id, FAIL, "H5Pcreate");
 
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
-    CHECK(ret, FAIL, "H5Dread");
+        ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
+        CHECK(ret, FAIL, "H5Pset_chunk");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++)
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
-            }
-    }
+        // ret = H5Pset_alloc_time(plist_id, alloc_time);
+        // CHECK(ret, FAIL, "H5Pset_alloc_time");
 
-    /* Now extend the dataset to SPACE1_DIM1*SPACE1_DIM2*SPACE1_DIM3 and make sure 
-     * we can write data to it */ 
-    ret = H5Dset_extent(dset1, extend_dims);
-    CHECK(ret, FAIL, "H5Dset_extent");
+        dset1 = H5Dcreate2(fid1, BASICDATASET1, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
+        CHECK(dset1, FAIL, "H5Dcreate2");
 
-    ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata_real);
-    CHECK(ret, FAIL, "H5Dwrite");
+        /* Write "nothing" to the dataset */
+        ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+        CHECK(ret, FAIL, "H5Dwrite");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata_real);
-    CHECK(ret, FAIL, "H5Dread");
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
+        CHECK(ret, FAIL, "H5Dread");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM1; i++) {
-        for(j=0; j<SPACE1_DIM2; j++) {
-            for(k=0; k<SPACE1_DIM3; k++) {
-                if(rdata_real[i][j][k] != wdata_real[i][j][k]) {
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++)
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d][%d] is %d but should have been %d\n",
-                       i, j, k, rdata_real[i][j][k], wdata_real[i][j][k]);
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
                 }
-            }
         }
-    }
-
-    /* Now shrink the first dimension size of the dataset to 0 and make sure no data is in it */
-    extend_dims[0] = 0;
-    ret = H5Dset_extent(dset1, extend_dims);
-    CHECK(ret, FAIL, "H5Dset_extent");
-
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
 
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
-    CHECK(ret, FAIL, "H5Dread");
-
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++)
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
+        /* Now extend the dataset to SPACE1_DIM1*SPACE1_DIM2*SPACE1_DIM3 and make sure 
+         * we can write data to it */ 
+        extend_dims[0] = SPACE1_DIM1;
+        ret = H5Dset_extent(dset1, extend_dims);
+        CHECK(ret, FAIL, "H5Dset_extent");
+
+        ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata_real);
+        CHECK(ret, FAIL, "H5Dwrite");
+
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
+
+        ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata_real);
+        CHECK(ret, FAIL, "H5Dread");
+
+        /* Check results */
+        for(i=0; i<SPACE1_DIM1; i++) {
+            for(j=0; j<SPACE1_DIM2; j++) {
+                for(k=0; k<SPACE1_DIM3; k++) {
+                    if(rdata_real[i][j][k] != wdata_real[i][j][k]) {
+                        H5_FAILED();
+                        printf("element [%d][%d][%d] is %d but should have been %d\n",
+                           i, j, k, rdata_real[i][j][k], wdata_real[i][j][k]);
+                    }
+                }
             }
-    }
+        }
 
-    /* Now extend the first dimension size of the dataset to SPACE1_DIM1*3 past the maximal size.
-     * It is supposed to fail. */
-    extend_dims[0] = SPACE1_DIM1*3;
-    H5E_BEGIN_TRY {
+        /* Now shrink the first dimension size of the dataset to 0 and make sure no data is in it */
+        extend_dims[0] = 0;
         ret = H5Dset_extent(dset1, extend_dims);
-    } H5E_END_TRY;
-    VERIFY(ret, FAIL, "H5Dset_extent");
-
-    ret = H5Pclose(plist_id);
-    CHECK(ret, FAIL, "H5Pclose");
-
-    ret = H5Dclose(dset1);
-    CHECK(ret, FAIL, "H5Dclose");
-
-    /*=================== Compact dataset =====================*/
-    plist_id = H5Pcreate(H5P_DATASET_CREATE);
-    CHECK(plist_id, FAIL, "H5Pcreate");
-
-    ret = H5Pset_layout(plist_id, H5D_COMPACT);
-    CHECK(ret, FAIL, "H5Pset_layout");
-
-    ret = H5Pset_alloc_time(plist_id, H5D_ALLOC_TIME_EARLY);
-    CHECK(ret, FAIL, "H5Pset_alloc_time");
+        CHECK(ret, FAIL, "H5Dset_extent");
 
-    dset1 = H5Dcreate2(fid1, BASICDATASET2, H5T_NATIVE_INT, sid1, H5P_DEFAULT, plist_id, H5P_DEFAULT);
-    CHECK(dset1, FAIL, "H5Dcreate2");
-
-    /* Write "nothing" to the dataset */
-    ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
-    CHECK(ret, FAIL, "H5Dwrite");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
+        CHECK(ret, FAIL, "H5Dread");
 
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
-    CHECK(ret, FAIL, "H5Dread");
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++)
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
+                }
+        }
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++)
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
-            }
-    }
+        /* Now extend the first dimension size of the dataset to SPACE1_DIM1*3 past the maximal size.
+         * It is supposed to fail. */
+        extend_dims[0] = SPACE1_DIM1*3;
+        H5E_BEGIN_TRY {
+            ret = H5Dset_extent(dset1, extend_dims);
+        } H5E_END_TRY;
+        VERIFY(ret, FAIL, "H5Dset_extent");
 
-    ret = H5Pclose(plist_id);
-    CHECK(ret, FAIL, "H5Pclose");
+        ret = H5Pclose(plist_id);
+        CHECK(ret, FAIL, "H5Pclose");
 
-    ret = H5Dclose(dset1);
-    CHECK(ret, FAIL, "H5Dclose");
+        ret = H5Dclose(dset1);
+        CHECK(ret, FAIL, "H5Dclose");
 
-    /*=========== Contiguous dataset with external storage ============*/
-    plist_id = H5Pcreate(H5P_DATASET_CREATE);
-    CHECK(plist_id, FAIL, "H5Pcreate");
+        /*=================== Compact dataset =====================*/
+        plist_id = H5Pcreate(H5P_DATASET_CREATE);
+        CHECK(plist_id, FAIL, "H5Pcreate");
 
-    ret = H5Pset_layout(plist_id, H5D_CONTIGUOUS);
-    CHECK(ret, FAIL, "H5Pset_layout");
+        ret = H5Pset_layout(plist_id, H5D_COMPACT);
+        CHECK(ret, FAIL, "H5Pset_layout");
 
-    /* Change the DCPL for contiguous layout with external storage.  The size of the reserved
-     * space in the external file is the size of the dataset (zero because one dimension size is zero).
-     * There's no need to clean up the external file since the library doesn't create it
-     * until the data is written to it. */
-    ret = H5Pset_external(plist_id, EXTFILE_NAME, (off_t)0, (hsize_t)0);
-    CHECK(ret, FAIL, "H5Pset_external");
+        /* Don't set the allocation time for compact storage datasets (must be early) */
 
-    dset1 = H5Dcreate2(fid1, BASICDATASET3, H5T_NATIVE_INT, sid1, H5P_DEFAULT, plist_id, H5P_DEFAULT);
-    CHECK(dset1, FAIL, "H5Dcreate2");
+        dset1 = H5Dcreate2(fid1, BASICDATASET2, H5T_NATIVE_INT, sid1, H5P_DEFAULT, plist_id, H5P_DEFAULT);
+        CHECK(dset1, FAIL, "H5Dcreate2");
 
-    /* Write "nothing" to the dataset */
-    ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, wdata);
-    CHECK(ret, FAIL, "H5Dwrite");
+        /* Write "nothing" to the dataset */
+        ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata);
+        CHECK(ret, FAIL, "H5Dwrite");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, rdata);
-    CHECK(ret, FAIL, "H5Dread");
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
+        CHECK(ret, FAIL, "H5Dread");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
-            }
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++)
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
+                }
         }
-    }
-
-    ret = H5Pclose(plist_id);
-    CHECK(ret, FAIL, "H5Pclose");
 
-    ret = H5Dclose(dset1);
-    CHECK(ret, FAIL, "H5Dclose");
+        ret = H5Pclose(plist_id);
+        CHECK(ret, FAIL, "H5Pclose");
 
-    /*=============== Create an attribute for the file ================*/
-    attr = H5Acreate2(fid1, NULLATTR, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT);
-    CHECK(attr, FAIL, "H5Acreate2");
+        ret = H5Dclose(dset1);
+        CHECK(ret, FAIL, "H5Dclose");
 
-    /* Write "nothing" to the attribute */
-    ret = H5Awrite(attr, H5T_NATIVE_INT, wdata);
-    CHECK(ret, FAIL, "H5Awrite");
+        /*=========== Contiguous dataset with external storage ============*/
+        plist_id = H5Pcreate(H5P_DATASET_CREATE);
+        CHECK(plist_id, FAIL, "H5Pcreate");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        /* Change the DCPL for contiguous layout with external storage.  The size of the reserved
+         * space in the external file is the size of the dataset (zero because one dimension size is zero).
+         * There's no need to clean up the external file since the library doesn't create it
+         * until the data is written to it. */
+        ret = H5Pset_external(plist_id, EXTFILE_NAME, (off_t)0, (hsize_t)0);
+        CHECK(ret, FAIL, "H5Pset_external");
 
-    /* Try reading from the attribute (make certain our buffer is unmodified) */
-    ret = H5Aread(attr, H5T_NATIVE_INT, rdata);
-    CHECK(ret, FAIL, "H5Aread");
+        ret = H5Pset_alloc_time(plist_id, alloc_time);
+        CHECK(ret, FAIL, "H5Pset_alloc_time");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
-            }
-        }
-    }
+        dset1 = H5Dcreate2(fid1, BASICDATASET3, H5T_NATIVE_INT, sid1, H5P_DEFAULT, plist_id, H5P_DEFAULT);
+        CHECK(dset1, FAIL, "H5Dcreate2");
 
-    /* Write "nothing" to the attribute (with type conversion :-) */
-    ret = H5Awrite(attr, H5T_NATIVE_SHORT, wdata_short);
-    CHECK(ret, FAIL, "H5Awrite");
+        /* Write "nothing" to the dataset */
+        ret = H5Dwrite(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, wdata);
+        CHECK(ret, FAIL, "H5Dwrite");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    /* Try reading from the attribute (with type conversion :-) (make certain our buffer is unmodified) */
-    ret = H5Aread(attr, H5T_NATIVE_SHORT, rdata_short);
-    CHECK(ret, FAIL, "H5Aread");
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, sid1, H5S_ALL, H5P_DEFAULT, rdata);
+        CHECK(ret, FAIL, "H5Dread");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata_short[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata_short[i][j]);
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
+                }
             }
         }
-    }
-
-    /* Close attribute */
-    ret = H5Aclose(attr);
-    CHECK(ret, FAIL, "H5Aclose");
-
-    /*===============================================================
-     * Extend the dimension to make it a normal dataspace (3x15x13).  
-     * Verify that data can be written to and read from the chunked 
-     * dataset now. 
-     *=============================================================== 
-     */
-    dims1[0]=SPACE1_DIM1;
-    ret = H5Sset_extent_simple(sid_chunk,SPACE1_RANK,dims1,max_dims);
-    CHECK(ret, FAIL, "H5Sset_extent_simple");
-
-    nelem = H5Sget_simple_extent_npoints(sid_chunk);
-    CHECK(nelem, FAIL, "H5Sget_simple_extent_npoints");
-    VERIFY(nelem, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3,
-	   "H5Sget_simple_extent_npoints");
-
-    rank = H5Sget_simple_extent_ndims(sid_chunk);
-    CHECK(rank, FAIL, "H5Sget_simple_extent_ndims");
-    VERIFY(rank, SPACE1_RANK, "H5Sget_simple_extent_ndims");
-
-    rank = H5Sget_simple_extent_dims(sid_chunk, tdims, NULL);
-    CHECK(rank, FAIL, "H5Sget_simple_extent_dims");
-    VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0,
-	   "H5Sget_simple_extent_dims");
 
-    /* Set it to chunked dataset */
-    plist_id = H5Pcreate(H5P_DATASET_CREATE);
-    CHECK(plist_id, FAIL, "H5Pcreate");
+        ret = H5Pclose(plist_id);
+        CHECK(ret, FAIL, "H5Pclose");
 
-    ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
-    CHECK(ret, FAIL, "H5Pset_chunk");
+        ret = H5Dclose(dset1);
+        CHECK(ret, FAIL, "H5Dclose");
 
-    dset1 = H5Dcreate2(fid1, BASICDATASET4, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
-    CHECK(dset1, FAIL, "H5Dcreate2");
+        /*=============== Create an attribute for the file ================*/
+        attr = H5Acreate2(fid1, NULLATTR, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT);
+        CHECK(attr, FAIL, "H5Acreate2");
 
-    ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata_real);
-    CHECK(ret, FAIL, "H5Dwrite");
+        /* Write "nothing" to the attribute */
+        ret = H5Awrite(attr, H5T_NATIVE_INT, wdata);
+        CHECK(ret, FAIL, "H5Awrite");
 
-    ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
-    CHECK(ret, FAIL, "H5Fflush");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata_real);
-    CHECK(ret, FAIL, "H5Dread");
+        /* Try reading from the attribute (make certain our buffer is unmodified) */
+        ret = H5Aread(attr, H5T_NATIVE_INT, rdata);
+        CHECK(ret, FAIL, "H5Aread");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM1; i++) {
-        for(j=0; j<SPACE1_DIM2; j++) {
-            for(k=0; k<SPACE1_DIM3; k++) {
-                if(rdata_real[i][j][k] != wdata_real[i][j][k]) {
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
                     H5_FAILED();
-                    printf("element [%d][%d][%d] is %d but should have been %d\n",
-                       i, j, k, rdata_real[i][j][k], wdata_real[i][j][k]);
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
                 }
             }
         }
-    }
-
-    ret = H5Pclose(plist_id);
-    CHECK(ret, FAIL, "H5Pclose");
-
-    ret = H5Dclose(dset1);
-    CHECK(ret, FAIL, "H5Dclose");
-
-    /* Change the dimensions to make them zero size again (0x0x0).  Verify that
-     * no element is in the dataspace. */
-    dims1[0]=dims1[1]=dims1[2]=0;
-    ret = H5Sset_extent_simple(sid_chunk,SPACE1_RANK,dims1,NULL);
-    CHECK(ret, FAIL, "H5Sset_extent_simple");
-
-    /* Check that the dataspace actually has 0 elements */
-    nelem = H5Sget_simple_extent_npoints(sid_chunk);
-    VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
-
-    /* Check that the dataspace was created with an "all" selection */
-    sel_type = H5Sget_select_type(sid_chunk);
-    VERIFY(sel_type, H5S_SEL_ALL, "H5Sget_select_type");
-
-    /* Check that the dataspace has 0 elements selected */
-    nelem = H5Sget_select_npoints(sid_chunk);
-    VERIFY(nelem, 0, "H5Sget_select_npoints");
-
-    /* Change to "none" selection */
-    ret = H5Sselect_none(sid_chunk);
-    CHECK(ret, FAIL, "H5Sselect_none");
-
-    /* Check that the dataspace has 0 elements selected */
-    nelem = H5Sget_select_npoints(sid_chunk);
-    VERIFY(nelem, 0, "H5Sget_select_npoints");
-
-    ret = H5Sclose(sid_chunk);
-    CHECK(ret, FAIL, "H5Sclose");
-
-    ret = H5Sclose(sid1);
-    CHECK(ret, FAIL, "H5Sclose");
-
-    ret = H5Fclose(fid1);
-    CHECK(ret, FAIL, "H5Fclose");
-
-    /*============================================
-     *  Reopen the file to check the data space
-     *============================================
-     */
-    fid1 = H5Fopen(ZEROFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
-    CHECK(fid1, FAIL, "H5Fopen");
-
-    /* Reopen the chunked dataset */
-    dset1 = H5Dopen2(fid1, BASICDATASET1, H5P_DEFAULT);
-    CHECK(dset1, FAIL, "H5Dopen2");
 
-    /* Get the space of the dataset and querry it */
-    sid1 = H5Dget_space(dset1);
-    CHECK(sid1, FAIL, "H5Dget_space");
+        /* Write "nothing" to the attribute (with type conversion :-) */
+        ret = H5Awrite(attr, H5T_NATIVE_SHORT, wdata_short);
+        CHECK(ret, FAIL, "H5Awrite");
 
-    /* Verify the class type of dataspace */
-    stype = H5Sget_simple_extent_type(sid1);
-    VERIFY(stype, H5S_SIMPLE, "H5Sget_simple_extent_type");
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
 
-    /* Verify there is zero element in the dataspace */
-    nelem = H5Sget_simple_extent_npoints(sid1);
-    VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
+        /* Try reading from the attribute (with type conversion :-) (make certain our buffer is unmodified) */
+        ret = H5Aread(attr, H5T_NATIVE_SHORT, rdata_short);
+        CHECK(ret, FAIL, "H5Aread");
 
-    /* Verify the dimension sizes are correct */
-    rank = H5Sget_simple_extent_dims(sid1, tdims, NULL);
-    CHECK(rank, FAIL, "H5Sget_simple_extent_dims");
-    VERIFY(tdims[0], 0, "H5Sget_simple_extent_dims");
-    VERIFY(tdims[1], SPACE1_DIM2, "H5Sget_simple_extent_dims");
-    VERIFY(tdims[2], SPACE1_DIM3, "H5Sget_simple_extent_dims");
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata_short[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata_short[i][j]);
+                }
+            }
+        }
 
-    /* Try reading from the dataset (make certain our buffer is unmodified) */
-    ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
-    CHECK(ret, FAIL, "H5Dread");
+        /* Close attribute */
+        ret = H5Aclose(attr);
+        CHECK(ret, FAIL, "H5Aclose");
+
+        /*===============================================================
+         * Extend the dimension to make it a normal dataspace (3x15x13).  
+         * Verify that data can be written to and read from the chunked 
+         * dataset now. 
+         *=============================================================== 
+         */
+        dims1[0]=SPACE1_DIM1;
+        ret = H5Sset_extent_simple(sid_chunk,SPACE1_RANK,dims1,max_dims);
+        CHECK(ret, FAIL, "H5Sset_extent_simple");
+
+        nelem = H5Sget_simple_extent_npoints(sid_chunk);
+        CHECK(nelem, FAIL, "H5Sget_simple_extent_npoints");
+        VERIFY(nelem, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3,
+               "H5Sget_simple_extent_npoints");
+
+        rank = H5Sget_simple_extent_ndims(sid_chunk);
+        CHECK(rank, FAIL, "H5Sget_simple_extent_ndims");
+        VERIFY(rank, SPACE1_RANK, "H5Sget_simple_extent_ndims");
+
+        rank = H5Sget_simple_extent_dims(sid_chunk, tdims, NULL);
+        CHECK(rank, FAIL, "H5Sget_simple_extent_dims");
+        VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0,
+               "H5Sget_simple_extent_dims");
+
+        /* Set it to chunked dataset */
+        plist_id = H5Pcreate(H5P_DATASET_CREATE);
+        CHECK(plist_id, FAIL, "H5Pcreate");
+
+        ret = H5Pset_chunk(plist_id, SPACE1_RANK, chunk_dims);
+        CHECK(ret, FAIL, "H5Pset_chunk");
+
+        ret = H5Pset_alloc_time(plist_id, alloc_time);
+        CHECK(ret, FAIL, "H5Pset_alloc_time");
+
+        dset1 = H5Dcreate2(fid1, BASICDATASET4, H5T_NATIVE_INT, sid_chunk, H5P_DEFAULT, plist_id, H5P_DEFAULT);
+        CHECK(dset1, FAIL, "H5Dcreate2");
+
+        ret = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wdata_real);
+        CHECK(ret, FAIL, "H5Dwrite");
+
+        ret = H5Fflush(fid1, H5F_SCOPE_GLOBAL);
+        CHECK(ret, FAIL, "H5Fflush");
+
+        ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata_real);
+        CHECK(ret, FAIL, "H5Dread");
+
+        /* Check results */
+        for(i=0; i<SPACE1_DIM1; i++) {
+            for(j=0; j<SPACE1_DIM2; j++) {
+                for(k=0; k<SPACE1_DIM3; k++) {
+                    if(rdata_real[i][j][k] != wdata_real[i][j][k]) {
+                        H5_FAILED();
+                        printf("element [%d][%d][%d] is %d but should have been %d\n",
+                           i, j, k, rdata_real[i][j][k], wdata_real[i][j][k]);
+                    }
+                }
+            }
+        }
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata[i][j]);
+        ret = H5Pclose(plist_id);
+        CHECK(ret, FAIL, "H5Pclose");
+
+        ret = H5Dclose(dset1);
+        CHECK(ret, FAIL, "H5Dclose");
+
+        /* Change the dimensions to make them zero size again (0x0x0).  Verify that
+         * no element is in the dataspace. */
+        dims1[0]=dims1[1]=dims1[2]=0;
+        ret = H5Sset_extent_simple(sid_chunk,SPACE1_RANK,dims1,NULL);
+        CHECK(ret, FAIL, "H5Sset_extent_simple");
+
+        /* Check that the dataspace actually has 0 elements */
+        nelem = H5Sget_simple_extent_npoints(sid_chunk);
+        VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
+
+        /* Check that the dataspace was created with an "all" selection */
+        sel_type = H5Sget_select_type(sid_chunk);
+        VERIFY(sel_type, H5S_SEL_ALL, "H5Sget_select_type");
+
+        /* Check that the dataspace has 0 elements selected */
+        nelem = H5Sget_select_npoints(sid_chunk);
+        VERIFY(nelem, 0, "H5Sget_select_npoints");
+
+        /* Change to "none" selection */
+        ret = H5Sselect_none(sid_chunk);
+        CHECK(ret, FAIL, "H5Sselect_none");
+
+        /* Check that the dataspace has 0 elements selected */
+        nelem = H5Sget_select_npoints(sid_chunk);
+        VERIFY(nelem, 0, "H5Sget_select_npoints");
+
+        ret = H5Sclose(sid_chunk);
+        CHECK(ret, FAIL, "H5Sclose");
+
+        ret = H5Sclose(sid1);
+        CHECK(ret, FAIL, "H5Sclose");
+
+        ret = H5Fclose(fid1);
+        CHECK(ret, FAIL, "H5Fclose");
+
+        /*============================================
+         *  Reopen the file to check the data space
+         *============================================
+         */
+        fid1 = H5Fopen(ZEROFILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+        CHECK(fid1, FAIL, "H5Fopen");
+
+        /* Reopen the chunked dataset */
+        dset1 = H5Dopen2(fid1, BASICDATASET1, H5P_DEFAULT);
+        CHECK(dset1, FAIL, "H5Dopen2");
+
+        /* Get the space of the dataset and querry it */
+        sid1 = H5Dget_space(dset1);
+        CHECK(sid1, FAIL, "H5Dget_space");
+
+        /* Verify the class type of dataspace */
+        stype = H5Sget_simple_extent_type(sid1);
+        VERIFY(stype, H5S_SIMPLE, "H5Sget_simple_extent_type");
+
+        /* Verify there is zero element in the dataspace */
+        nelem = H5Sget_simple_extent_npoints(sid1);
+        VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
+
+        /* Verify the dimension sizes are correct */
+        rank = H5Sget_simple_extent_dims(sid1, tdims, NULL);
+        CHECK(rank, FAIL, "H5Sget_simple_extent_dims");
+        VERIFY(tdims[0], 0, "H5Sget_simple_extent_dims");
+        VERIFY(tdims[1], SPACE1_DIM2, "H5Sget_simple_extent_dims");
+        VERIFY(tdims[2], SPACE1_DIM3, "H5Sget_simple_extent_dims");
+
+        /* Try reading from the dataset (make certain our buffer is unmodified) */
+        ret = H5Dread(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rdata);
+        CHECK(ret, FAIL, "H5Dread");
+
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata[i][j]);
+                }
             }
         }
-    }
 
-    /* Close the dataset and its dataspace */
-    ret = H5Dclose(dset1);
-    CHECK(ret, FAIL, "H5Dclose");
+        /* Close the dataset and its dataspace */
+        ret = H5Dclose(dset1);
+        CHECK(ret, FAIL, "H5Dclose");
 
-    ret = H5Sclose(sid1);
-    CHECK(ret, FAIL, "H5Sclose");
+        ret = H5Sclose(sid1);
+        CHECK(ret, FAIL, "H5Sclose");
 
-    /* Open the attribute for the file */
-    attr = H5Aopen(fid1, NULLATTR, H5P_DEFAULT);
-    CHECK(attr, FAIL, "H5Aopen");
+        /* Open the attribute for the file */
+        attr = H5Aopen(fid1, NULLATTR, H5P_DEFAULT);
+        CHECK(attr, FAIL, "H5Aopen");
 
-    /* Get the space of the dataset */
-    attr_sid = H5Aget_space(attr);
-    CHECK(attr_sid, FAIL, "H5Aget_space");
+        /* Get the space of the dataset */
+        attr_sid = H5Aget_space(attr);
+        CHECK(attr_sid, FAIL, "H5Aget_space");
 
-    /* Verify the class type of dataspace */
-    stype = H5Sget_simple_extent_type(attr_sid);
-    VERIFY(stype, H5S_SIMPLE, "H5Sget_simple_extent_type");
+        /* Verify the class type of dataspace */
+        stype = H5Sget_simple_extent_type(attr_sid);
+        VERIFY(stype, H5S_SIMPLE, "H5Sget_simple_extent_type");
 
-    /* Verify there is zero element in the dataspace */
-    nelem = H5Sget_simple_extent_npoints(attr_sid);
-    VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
+        /* Verify there is zero element in the dataspace */
+        nelem = H5Sget_simple_extent_npoints(attr_sid);
+        VERIFY(nelem, 0, "H5Sget_simple_extent_npoints");
 
-    /* Try reading from the attribute (make certain our buffer is unmodified) */
-    ret = H5Aread(attr, H5T_NATIVE_SHORT, rdata_short);
-    CHECK(ret, FAIL, "H5Aread");
+        /* Try reading from the attribute (make certain our buffer is unmodified) */
+        ret = H5Aread(attr, H5T_NATIVE_SHORT, rdata_short);
+        CHECK(ret, FAIL, "H5Aread");
 
-    /* Check results */
-    for(i=0; i<SPACE1_DIM2; i++) {
-        for(j=0; j<SPACE1_DIM3; j++) {
-            if(rdata_short[i][j] != 7) {
-                H5_FAILED();
-                printf("element [%d][%d] is %d but should have been 7\n",
-                       i, j, rdata_short[i][j]);
+        /* Check results */
+        for(i=0; i<SPACE1_DIM2; i++) {
+            for(j=0; j<SPACE1_DIM3; j++) {
+                if(rdata_short[i][j] != 7) {
+                    H5_FAILED();
+                    printf("element [%d][%d] is %d but should have been 7\n",
+                           i, j, rdata_short[i][j]);
+                }
             }
         }
-    }
 
-    /* Close attribute */
-    ret=H5Aclose(attr);
-    CHECK(ret, FAIL, "H5Aclose");
+        /* Close attribute */
+        ret=H5Aclose(attr);
+        CHECK(ret, FAIL, "H5Aclose");
 
-    /* Close the dataspace */
-    ret = H5Sclose(attr_sid);
-    CHECK(ret, FAIL, "H5Sclose");
+        /* Close the dataspace */
+        ret = H5Sclose(attr_sid);
+        CHECK(ret, FAIL, "H5Sclose");
 
-    ret = H5Fclose(fid1);
-    CHECK(ret, FAIL, "H5Fclose");
-}	/* test_h5s_zero_dim() */
+        ret = H5Fclose(fid1);
+        CHECK(ret, FAIL, "H5Fclose");
+    } /* end for */
+} /* test_h5s_zero_dim() */
 
 
 /****************************************************************
-- 
cgit v0.12