[svn-r8600] Purpose:

    Code optimization

Description:
    Don't recompute the internal index value for looking up the chunk in the
hash table, just use the value already computed from iterating through the
chunks.

Platforms tested:
    Solaris 2.7 (arabica)
    FreeBSD 4.9 (sleipnir) w/parallel

1 files changed, 91 insertions, 86 deletions

diff --git a/test/set_extent.c b/test/set_extent.c
index 067dabc..845d621 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -67,17 +67,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) goto out;
+    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) goto out;
+    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) goto out;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) goto out;
-    if (H5Pset_fill_value( plist_id, H5T_NATIVE_INT, &fillvalue )<0) goto out; 
+    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;
 
 
     /*-------------------------------------------------------------------------
@@ -86,10 +86,10 @@ int main( void )
     */
 
     /* Create a new dataset */
-    if ((dataset_id = H5Dcreate( file_id , "Dataset1", H5T_NATIVE_INT, space_id, plist_id ))<0) goto out;
+    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) goto out;
+    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 
@@ -97,15 +97,16 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims_new )<0) goto out;
+    if (H5Dset_extent( dataset_id , dims_new )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims_new[0] ) goto out;
+    if ( dims_out[0] != dims_new[0] ) TEST_ERROR;
+    if ( dims_out[1] != dims_new[1] ) TEST_ERROR;
 
 
     /*-------------------------------------------------------------------------
@@ -114,13 +115,17 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) goto out;
+    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] ) goto out;
+            if (  buf1[i][j] != data[i][j] ) {
+                printf("buf1[%d][%d]=%d\n",i,j,buf1[i][j]);
+                printf("data[%d][%d]=%d\n",i,j,data[i][j]);
+                TEST_ERROR;
+            } /* end if */
 
 
     /*-------------------------------------------------------------------------
@@ -129,15 +134,15 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) goto out;
+    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims[0] ) goto out;
+    if ( dims_out[0] != dims[0] ) TEST_ERROR;
 
 
     /*-------------------------------------------------------------------------
@@ -146,16 +151,16 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) goto out;
+    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++ ) {
         for( j = 0; j < (int)dims_out[1]; j++ ) {
             if ( i >= 70 || j >= 70 ) {
-                if (  buf2[i][j] != fillvalue ) goto out;
+                if (  buf2[i][j] != fillvalue ) TEST_ERROR;
             }
             else {
-                if (  buf2[i][j] != data[i][j] ) goto out;
+                if (  buf2[i][j] != data[i][j] ) TEST_ERROR;
             }
         }
     }
@@ -174,12 +179,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) goto out;
+    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) goto out;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) goto out;
-    if (H5Pset_fill_time( plist_id, H5D_FILL_TIME_ALLOC)<0) goto out;
+    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
@@ -187,10 +192,10 @@ int main( void )
     */
 
     /* Create a new dataset */
-    if ((dataset_id = H5Dcreate( file_id , "Dataset2", H5T_NATIVE_INT, space_id, plist_id ))<0) goto out;
+    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) goto out;
+    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 
@@ -198,15 +203,15 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims_new )<0) goto out;
+    if (H5Dset_extent( dataset_id , dims_new )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims_new[0] ) goto out;
+    if ( dims_out[0] != dims_new[0] ) TEST_ERROR;
 
 
     /*-------------------------------------------------------------------------
@@ -215,13 +220,13 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf1 )<0) goto out;
+    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] ) goto out;
+            if (  buf1[i][j] != data[i][j] ) TEST_ERROR;
 
 
     /*-------------------------------------------------------------------------
@@ -230,15 +235,15 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) goto out;
+    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims[0] ) goto out;
+    if ( dims_out[0] != dims[0] ) TEST_ERROR;
 
 
     /*-------------------------------------------------------------------------
@@ -247,16 +252,16 @@ int main( void )
     */
 
     /* Read the new dataset. */
-    if (H5Dread( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf2 )<0) goto out;
+    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++ ) {
         for( j = 0; j < (int)dims_out[1]; j++ ) {
             if ( i >= 70 || j >= 70 ) {
-                if (  buf2[i][j] != 0 ) goto out;
+                if (  buf2[i][j] != 0 ) TEST_ERROR;
             }
             else {
-                if (  buf2[i][j] != data[i][j] ) goto out;
+                if (  buf2[i][j] != data[i][j] ) TEST_ERROR;
             }
         }
     }
@@ -283,32 +288,32 @@ int main( void )
     */
 
     /* Create a file creation property list */
-    if((fcpl = H5Pcreate(H5P_FILE_CREATE))<0) goto out;
+    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) goto out;
+    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) goto out;
+    if ((file_id = H5Fcreate( "set_extent_read.h5", H5F_ACC_TRUNC, fcpl, H5P_DEFAULT ))<0) TEST_ERROR;
 
     /* Close property list */
-    if(H5Pclose(fcpl)<0) goto out;
+    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) goto out; 
+    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) goto out;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) goto out;
-    if (H5Pset_fill_value( plist_id, H5T_NATIVE_INT, &fillvalue )<0) goto out; 
+    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) goto out;
+    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) goto out;
+    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data )<0) TEST_ERROR;
 
     /* Close/release resources. */
     H5Dclose( dataset_id );
@@ -318,29 +323,29 @@ int main( void )
 
 
     /* Open the file */
-    if ((file_id = H5Fopen( "set_extent_read.h5", H5F_ACC_RDWR, H5P_DEFAULT ))<0) goto out;
+    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) goto out;
+    if ((dataset_id = H5Dopen( file_id , "Dataset1" ))<0) TEST_ERROR;
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id, dims_new )<0) goto out;
+    if (H5Dset_extent( dataset_id, dims_new )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims_new[0] ) goto out;
+    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) goto out;
+    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] )    goto out;
+            if (  buf1[i][j] != data[i][j] )    TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Set new dimensions for the array; expand it again 
@@ -348,27 +353,27 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) goto out;
+    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims[0] ) goto out;
+    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) goto out;
+    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++ ) {
         for( j = 0; j < (int)dims_out[1]; j++ ) {
             if ( i >= 70 || j >= 70 ) {
-                if (  buf2[i][j] != fillvalue ) goto out;
+                if (  buf2[i][j] != fillvalue ) TEST_ERROR;
             }
             else {
-                if (  buf2[i][j] != data[i][j] ) goto out;
+                if (  buf2[i][j] != data[i][j] ) TEST_ERROR;
             }
         }
     }
@@ -388,18 +393,18 @@ 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) goto out; 
+    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) goto out;
-    if (H5Pset_chunk( plist_id, RANK, dims_chunk )<0) goto out;
-    if (H5Pset_fill_time( plist_id, H5D_FILL_TIME_ALLOC)<0) goto out;
+    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) goto out;
+    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) goto out;
+    if (H5Dwrite( dataset_id , H5T_NATIVE_INT, space_id, H5S_ALL, H5P_DEFAULT, data )<0) TEST_ERROR;
 
     /* Close/release resources. */
     H5Dclose( dataset_id );
@@ -409,29 +414,29 @@ int main( void )
 
 
     /* Open the file */
-    if ((file_id = H5Fopen( "set_extent_read.h5", H5F_ACC_RDWR, H5P_DEFAULT ))<0) goto out;
+    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) goto out;
+    if ((dataset_id = H5Dopen( file_id , "Dataset2" ))<0) TEST_ERROR;
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id, dims_new )<0) goto out;
+    if (H5Dset_extent( dataset_id, dims_new )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims_new[0] ) goto out;
+    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) goto out;
+    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] ) goto out;
+            if (  buf1[i][j] != data[i][j] ) TEST_ERROR;
 
     /*-------------------------------------------------------------------------
     * Set new dimensions for the array; expand it again 
@@ -439,27 +444,27 @@ int main( void )
     */
 
     /* Set new dimensions for the array. */
-    if (H5Dset_extent( dataset_id , dims )<0) goto out;
+    if (H5Dset_extent( dataset_id , dims )<0) TEST_ERROR;
 
     /* Get the space. */
-    if ((space_id = H5Dget_space( dataset_id ))<0) goto out;
+    if ((space_id = H5Dget_space( dataset_id ))<0) TEST_ERROR;
 
     /* Get dimensions. */
-    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) goto out;
+    if (H5Sget_simple_extent_dims( space_id, dims_out, NULL )<0) TEST_ERROR;
 
-    if ( dims_out[0] != dims[0] ) goto out;
+    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) goto out;
+    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++ ) {
         for( j = 0; j < (int)dims_out[1]; j++ ) {
             if ( i >= 70 || j >= 70 ) {
-                if (  buf2[i][j] != 0 ) goto out;
+                if (  buf2[i][j] != 0 ) TEST_ERROR;
             }
             else {
-                if (  buf2[i][j] != data[i][j] ) goto out;
+                if (  buf2[i][j] != data[i][j] ) TEST_ERROR;
             }
         }
     }
@@ -482,7 +487,7 @@ int main( void )
     return 0;
 
 
-out:
+error:
     H5Dclose( dataset_id );
     H5Sclose( space_id );
     H5Pclose( plist_id  );