[svn-r14861] Description:

    Bring revision 14860 back to 1.8 branch, change log for rev 14860 is:

        Omnibus raw data I/O revisions, with wide-ranging changes and
refactoring, in order to prepare for implementing "fast append" feature.

        These changes remove the majority of the code duplication for raw data
I/O which has crept in over the last ten years and introduces a more object-
oriented design for operating on different types of dataset storage.

Description:
        Omnibus raw data I/O revisions, with wide-ranging changes and
refactoring, in order to prepare for implementing "fast append" feature.

        These changes remove the majority of the code duplication for raw data
I/O which has crept in over the last ten years and introduces a more object-
oriented design for operating on different types of dataset storage.

        Chunked storage no longer has it's own I/O routines, it is now handled
as either contiguous (if chunk is not pulled into the cache) or compact (if the
chunk is cached in memory).

        No bug or feature changes, at least intentionally... :-)

Tested on:
    Mac OS X/32 10.5.2 (amazon) w/production

1 files changed, 23 insertions, 23 deletions

diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 66993e0..a03d37e 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -1421,32 +1421,32 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Create xfer properties to preserve initialized data */
     if((dxpl = H5Pcreate(H5P_DATASET_XFER)) < 0)
-       goto error;
+       FAIL_STACK_ERROR
 
     if(H5Pset_preserve(dxpl, TRUE) < 0)
-       goto error;
+       FAIL_STACK_ERROR
 
     /* Rewrite contiguous data set */
     if((dataset = H5Dopen2(file, DSET_NAME[0], H5P_DEFAULT)) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	goto error;
+	FAIL_STACK_ERROR
 
     if(H5Dclose(dataset) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     /* Rewrite chunked data set */
     if((dataset = H5Dopen2(file, DSET_NAME[1], H5P_DEFAULT)) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     /* Write the data to the dataset */
     if(H5Dwrite(dataset, rew_tid, H5S_ALL, H5S_ALL, dxpl, rew_buf) < 0)
-	goto error;
+	FAIL_STACK_ERROR
 
     if(H5Dclose(dataset) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     PASSED();
 
@@ -1458,48 +1458,48 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 
     /* Check contiguous data set */
     if((dataset = H5Dopen2(file, DSET_NAME[0], H5P_DEFAULT)) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(compare_data(orig, rbuf, TRUE) < 0) 
-        goto error;
+        TEST_ERROR
 
     if(H5Dclose(dataset) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     /* Check chunked data set */
     if((dataset = H5Dopen2(file, DSET_NAME[1], H5P_DEFAULT)) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(H5Dread(dataset, dst_tid, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(compare_data(orig, rbuf, TRUE) < 0) 
-        goto error;
+        TEST_ERROR
 
     if(H5Dclose(dataset) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     /* Finishing test and release resources */
     if(H5Sclose(space) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(H5Pclose(dcpl) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(H5Pclose(dxpl) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     if(H5Tclose(src_tid) < 0)
-        goto error;
+        FAIL_STACK_ERROR
     if(H5Tclose(dst_tid) < 0)
-        goto error;
+        FAIL_STACK_ERROR
     if(H5Tclose(rew_tid) < 0)
-        goto error;
+        FAIL_STACK_ERROR
     if(H5Fclose(file) < 0)
-        goto error;
+        FAIL_STACK_ERROR
 
     free(orig);
     free(rbuf);