[svn-r14193] Description:

	Make H5Dopen versioned and change all internal usage to use H5Dopen2

	Add simple regression test for H5Dopen1

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.4.10 (amazon) in debug mode

1 files changed, 79 insertions, 77 deletions

diff --git a/test/set_extent.c b/test/set_extent.c
index c4c3ed0..40beda4 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -68,17 +68,17 @@ int main( void )
 
 
     /* Create a new file using default properties. */
-    if ((file_id = H5Fcreate( "set_extent_create.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT ))<0) TEST_ERROR;
+    if ((file_id = H5Fcreate( "set_extent_create.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT )) < 0) TEST_ERROR;
 
     TESTING("extend dataset create with fill value");
 
     /* Create the data space with unlimited dimensions. */
-    if ((space_id = H5Screate_simple( RANK, dims, maxdims ))<0) TEST_ERROR;
+    if ((space_id = H5Screate_simple( RANK, dims, maxdims )) < 0) TEST_ERROR;
 
     /* Modify dataset creation properties, i.e. enable chunking. */
-    if ((plist_id = H5Pcreate (H5P_DATASET_CREATE ))<0) TEST_ERROR;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) TEST_ERROR;
-    if (H5Pset_fill_value( plist_id, H5T_NATIVE_INT, &fillvalue )<0) TEST_ERROR;
+    if ((plist_id = H5Pcreate (H5P_DATASET_CREATE )) < 0) TEST_ERROR;
+    if (H5Pset_chunk( plist_id, RANK, dims_chunk ) < 0) TEST_ERROR;
+    if (H5Pset_fill_value( plist_id, H5T_NATIVE_INT, &fillvalue ) < 0) TEST_ERROR;
 
 
     /*-------------------------------------------------------------------------
@@ -87,10 +87,10 @@ int main( void )
     */
 
     /* Create a new dataset */
-    if ((dataset_id = H5Dcreate( file_id , "Dataset1", H5T_NATIVE_INT, space_id, plist_id ))<0) TEST_ERROR;
+    if ((dataset_id = H5Dcreate( file_id , "Dataset1", H5T_NATIVE_INT, space_id, plist_id )) < 0) TEST_ERROR;
 
     /* Write the data. */
-    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data )<0) TEST_ERROR;
+    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data ) < 0) TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Set new dimensions for the array; shrink it
@@ -98,13 +98,13 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims_new )<0) TEST_ERROR;
+    if (H5Dset_extent( dataset_id , dims_new ) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if ((space_id = H5Dget_space( dataset_id )) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL ) < 0) TEST_ERROR;
 
     if ( dims_out[0] != dims_new[0] ) TEST_ERROR;
     if ( dims_out[1] != dims_new[1] ) TEST_ERROR;
@@ -116,7 +116,7 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) TEST_ERROR;
+    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 ) < 0) TEST_ERROR;
 
 
     /* Compare the read array with the original array */
@@ -183,12 +183,12 @@ int main( void )
     TESTING("extend dataset create without fill value");
 
     /* Create the data space with unlimited dimensions. */
-    if ((space_id = H5Screate_simple( RANK, dims, maxdims ))<0) TEST_ERROR;
+    if ((space_id = H5Screate_simple( RANK, dims, maxdims )) < 0) TEST_ERROR;
 
     /* Modify dataset creation properties, i.e. enable chunking. */
-    if ((plist_id = H5Pcreate (H5P_DATASET_CREATE ))<0) TEST_ERROR;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) TEST_ERROR;
-    if (H5Pset_fill_time( plist_id, H5D_FILL_TIME_ALLOC)<0) TEST_ERROR;
+    if ((plist_id = H5Pcreate (H5P_DATASET_CREATE )) < 0) TEST_ERROR;
+    if (H5Pset_chunk( plist_id, RANK, dims_chunk ) < 0) TEST_ERROR;
+    if (H5Pset_fill_time( plist_id, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Create and write one dataset
@@ -196,10 +196,10 @@ int main( void )
     */
 
     /* Create a new dataset */
-    if ((dataset_id = H5Dcreate( file_id , "Dataset2", H5T_NATIVE_INT, space_id, plist_id ))<0) TEST_ERROR;
+    if ((dataset_id = H5Dcreate( file_id , "Dataset2", H5T_NATIVE_INT, space_id, plist_id )) < 0) TEST_ERROR;
 
     /* Write the data. */
-    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data )<0) TEST_ERROR;
+    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data ) < 0) TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Set new dimensions for the array; shrink it
@@ -207,13 +207,13 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims_new )<0) TEST_ERROR;
+    if (H5Dset_extent( dataset_id , dims_new ) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if ((space_id = H5Dget_space( dataset_id )) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL ) < 0) TEST_ERROR;
 
     if ( dims_out[0] != dims_new[0] ) TEST_ERROR;
 
@@ -224,7 +224,7 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) TEST_ERROR;
+    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 ) < 0) TEST_ERROR;
 
 
     /* Compare the read array with the original array */
@@ -239,13 +239,13 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
+    if (H5Dset_extent( dataset_id , dims ) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if ((space_id = H5Dget_space( dataset_id )) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL ) < 0) TEST_ERROR;
 
     if ( dims_out[0] != dims[0] ) TEST_ERROR;
 
@@ -256,7 +256,7 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) TEST_ERROR;
+    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 ) < 0) TEST_ERROR;
 
     /* Compare the read array with the original array */
     for( i = 0; i < (int)dims_out[0]; i++ ) {
@@ -292,64 +292,65 @@ int main( void )
     */
 
     /* Create a file creation property list */
-    if((fcpl = H5Pcreate(H5P_FILE_CREATE))<0) TEST_ERROR;
+    if((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) TEST_ERROR;
 
     /* Set non-default indexed storage B-tree internal 'K' value */
-    if(H5Pset_istore_k(fcpl,ISTORE_IK)<0) TEST_ERROR;
+    if(H5Pset_istore_k(fcpl,ISTORE_IK) < 0) TEST_ERROR;
 
     /* Create a new file using properties. */
-    if ((file_id = H5Fcreate( "set_extent_read.h5", H5F_ACC_TRUNC, fcpl, H5P_DEFAULT ))<0) TEST_ERROR;
+    if ((file_id = H5Fcreate( "set_extent_read.h5", H5F_ACC_TRUNC, fcpl, H5P_DEFAULT )) < 0) TEST_ERROR;
 
     /* Close property list */
-    if(H5Pclose(fcpl)<0) TEST_ERROR;
+    if(H5Pclose(fcpl) < 0) TEST_ERROR;
 
     TESTING("extend dataset read with fill value");
 
     /* Create the data space with unlimited dimensions. */
-    if ((space_id = H5Screate_simple( RANK, dims, maxdims ))<0) TEST_ERROR;
+    if((space_id = H5Screate_simple(RANK, dims, maxdims)) < 0) TEST_ERROR;
 
     /* Modify dataset creation properties, i.e. enable chunking. */
-    if ((plist_id = H5Pcreate (H5P_DATASET_CREATE ))<0) TEST_ERROR;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) TEST_ERROR;
-    if (H5Pset_fill_value( plist_id, H5T_NATIVE_INT, &fillvalue )<0) TEST_ERROR;
+    if((plist_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;
+    if(H5Pset_chunk(plist_id, RANK, dims_chunk) < 0) TEST_ERROR;
+    if(H5Pset_fill_value(plist_id, H5T_NATIVE_INT, &fillvalue) < 0) TEST_ERROR;
 
     /* Create a new dataset within the file using cparms creation properties. */
-    if ((dataset_id = H5Dcreate( file_id , "Dataset1", H5T_NATIVE_INT, space_id, plist_id ))<0) TEST_ERROR;
+    if((dataset_id = H5Dcreate(file_id , "Dataset1", H5T_NATIVE_INT, space_id, plist_id)) < 0) TEST_ERROR;
 
     /* Write the data. */
-    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data )<0) TEST_ERROR;
+    if(H5Dwrite(dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR;
 
     /* Close/release resources. */
-    H5Dclose( dataset_id );
-    H5Sclose( space_id );
-    H5Pclose( plist_id  );
-    H5Fclose( file_id );
+    if(H5Dclose(dataset_id) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(space_id) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(plist_id) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR
 
 
     /* Open the file */
-    if ((file_id = H5Fopen( "set_extent_read.h5", H5F_ACC_RDWR, H5P_DEFAULT ))<0) TEST_ERROR;
+    if((file_id = H5Fopen("set_extent_read.h5", H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR;
 
     /* Open the dataset */
-    if ((dataset_id = H5Dopen( file_id , "Dataset1" ))<0) TEST_ERROR;
+    if((dataset_id = H5Dopen2(file_id , "Dataset1", H5P_DEFAULT)) < 0) TEST_ERROR;
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id, dims_new )<0) TEST_ERROR;
+    if(H5Dset_extent(dataset_id, dims_new) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if((space_id = H5Dget_space(dataset_id)) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if(H5Sget_simple_extent_dims(space_id, dims_out, NULL) < 0) TEST_ERROR;
 
-    if ( dims_out[0] != dims_new[0] ) TEST_ERROR;
+    if(dims_out[0] != dims_new[0]) TEST_ERROR;
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) TEST_ERROR;
+    if(H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1) < 0) TEST_ERROR;
 
     /* Compare the read array with the original array */
-    for( i = 0; i < (int)dims_out[0]; i++ )
-        for( j = 0; j < (int)dims_out[1]; j++ )
-            if (  buf1[i][j] != data[i][j] )    TEST_ERROR;
+    for(i = 0; i < (int)dims_out[0]; i++)
+        for(j = 0; j < (int)dims_out[1]; j++)
+            if(buf1[i][j] != data[i][j])
+                TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Set new dimensions for the array; expand it again
@@ -357,18 +358,18 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
+    if (H5Dset_extent( dataset_id , dims ) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if ((space_id = H5Dget_space( dataset_id )) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL ) < 0) TEST_ERROR;
 
     if ( dims_out[0] != dims[0] ) TEST_ERROR;
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) TEST_ERROR;
+    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 ) < 0) TEST_ERROR;
 
     /* Compare the read array with the original array */
     for( i = 0; i < (int)dims_out[0]; i++ ) {
@@ -397,50 +398,51 @@ int main( void )
     TESTING("extend dataset read without fill value");
 
     /* Create the data space with unlimited dimensions. */
-    if ((space_id = H5Screate_simple( RANK, dims, maxdims ))<0) TEST_ERROR;
+    if((space_id = H5Screate_simple(RANK, dims, maxdims)) < 0) TEST_ERROR;
 
     /* Modify dataset creation properties, i.e. enable chunking. */
-    if ((plist_id = H5Pcreate (H5P_DATASET_CREATE ))<0) TEST_ERROR;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) TEST_ERROR;
-    if (H5Pset_fill_time( plist_id, H5D_FILL_TIME_ALLOC)<0) TEST_ERROR;
+    if((plist_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR;
+    if(H5Pset_chunk(plist_id, RANK, dims_chunk) < 0) TEST_ERROR;
+    if(H5Pset_fill_time(plist_id, H5D_FILL_TIME_ALLOC) < 0) TEST_ERROR;
 
     /* Create a new dataset within the file using cparms creation properties. */
-    if ((dataset_id = H5Dcreate( file_id , "Dataset2", H5T_NATIVE_INT, space_id, plist_id ))<0) TEST_ERROR;
+    if((dataset_id = H5Dcreate(file_id , "Dataset2", H5T_NATIVE_INT, space_id, plist_id)) < 0) TEST_ERROR;
 
     /* Write the data. */
-    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data )<0) TEST_ERROR;
+    if(H5Dwrite(dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR;
 
     /* Close/release resources. */
-    H5Dclose( dataset_id );
-    H5Sclose( space_id );
-    H5Pclose( plist_id  );
-    H5Fclose( file_id );
+    if(H5Dclose(dataset_id) < 0) FAIL_STACK_ERROR
+    if(H5Sclose(space_id) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(plist_id) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR
 
 
     /* Open the file */
-    if ((file_id = H5Fopen( "set_extent_read.h5", H5F_ACC_RDWR, H5P_DEFAULT ))<0) TEST_ERROR;
+    if((file_id = H5Fopen("set_extent_read.h5", H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR;
 
     /* Open the dataset */
-    if ((dataset_id = H5Dopen( file_id , "Dataset2" ))<0) TEST_ERROR;
+    if((dataset_id = H5Dopen2(file_id , "Dataset2", H5P_DEFAULT)) < 0) TEST_ERROR;
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id, dims_new )<0) TEST_ERROR;
+    if(H5Dset_extent(dataset_id, dims_new) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if((space_id = H5Dget_space(dataset_id)) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if(H5Sget_simple_extent_dims(space_id, dims_out, NULL) < 0) TEST_ERROR;
 
-    if ( dims_out[0] != dims_new[0] ) TEST_ERROR;
+    if(dims_out[0] != dims_new[0]) TEST_ERROR;
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) TEST_ERROR;
+    if(H5Dread(dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1) < 0) TEST_ERROR;
 
     /* Compare the read array with the original array */
-    for( i = 0; i < (int)dims_out[0]; i++ )
-        for( j = 0; j < (int)dims_out[1]; j++ )
-            if (  buf1[i][j] != data[i][j] ) TEST_ERROR;
+    for(i = 0; i < (int)dims_out[0]; i++)
+        for(j = 0; j < (int)dims_out[1]; j++)
+            if(buf1[i][j] != data[i][j])
+                TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Set new dimensions for the array; expand it again
@@ -448,18 +450,18 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
+    if (H5Dset_extent( dataset_id , dims ) < 0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
+    if ((space_id = H5Dget_space( dataset_id )) < 0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL ) < 0) TEST_ERROR;
 
     if ( dims_out[0] != dims[0] ) TEST_ERROR;
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) TEST_ERROR;
+    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 ) < 0) TEST_ERROR;
 
     /* Compare the read array with the original array */
     for( i = 0; i < (int)dims_out[0]; i++ ) {