[svn-r18197] Description:

    Trim trailing whitespace from source code files with this command:

find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.f90" \) -print |xargs -n 1 sed -i "" 's/[[:blank:]]*$//'

Tested on:
    None - eyeballed only

1 files changed, 633 insertions, 633 deletions

diff --git a/test/set_extent.c b/test/set_extent.c
index b4e61b4..c65e7d0 100644
--- a/test/set_extent.c
+++ b/test/set_extent.c
@@ -60,18 +60,18 @@ const char *FILENAME[] = {
 static int do_ranks( hid_t fapl );
 static int do_layouts( hid_t fapl );
 
-static int test_rank1( hbool_t do_compress, 
-                       hbool_t do_fill_value, 
+static int test_rank1( hbool_t do_compress,
+                       hbool_t do_fill_value,
                        hbool_t set_istore_k,
                        H5D_fill_time_t fill_time,
                        hid_t fapl);
-static int test_rank2( hbool_t do_compress, 
-                       hbool_t do_fill_value, 
+static int test_rank2( hbool_t do_compress,
+                       hbool_t do_fill_value,
                        hbool_t set_istore_k,
                        H5D_fill_time_t fill_time,
                        hid_t fapl);
-static int test_rank3( hbool_t do_compress, 
-                       hbool_t do_fill_value, 
+static int test_rank3( hbool_t do_compress,
+                       hbool_t do_fill_value,
                        hbool_t set_istore_k,
                        H5D_fill_time_t fill_time,
                        hid_t fapl);
@@ -152,7 +152,7 @@ int main( void )
     if(H5Pclose(fapl2) < 0) TEST_ERROR
 
     h5_cleanup(FILENAME, fapl);
-   
+
     HDremove(EXT_FILE_NAME1);
     HDremove(EXT_FILE_NAME2);
 
@@ -180,8 +180,8 @@ static int do_ranks( hid_t fapl )
     hbool_t do_compress = 0;
     hbool_t do_fillvalue = 0;
     hbool_t set_istore_k = 0;
-      
-      
+
+
     TESTING_2("with fill value, no compression");
 
     do_fillvalue = 1;
@@ -189,28 +189,28 @@ static int do_ranks( hid_t fapl )
     if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
     {
         goto error;
-    } 
+    }
     if (test_rank1( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
     {
         goto error;
-    } 
+    }
     if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
     {
         goto error;
-    } 
+    }
     if (test_rank2( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
     {
         goto error;
-    } 
+    }
     if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_ALLOC, fapl ) < 0)
     {
         goto error;
-    } 
+    }
     if (test_rank3( do_compress, do_fillvalue, set_istore_k, H5D_FILL_TIME_IFSET, fapl ) < 0)
     {
         goto error;
-    } 
-   
+    }
+
 
 
     PASSED();
@@ -232,11 +232,11 @@ static int do_ranks( hid_t fapl )
     {
         goto error;
     }
-   
-   
+
+
 
     PASSED();
-    
+
     TESTING_2("with fill value, with compression");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
@@ -268,8 +268,8 @@ static int do_ranks( hid_t fapl )
     {
         goto error;
     }
-  
-     
+
+
     PASSED();
 #else
     SKIPPED();
@@ -293,7 +293,7 @@ static int do_ranks( hid_t fapl )
     {
         goto error;
     }
-     
+
     PASSED();
 #else
     SKIPPED();
@@ -308,14 +308,14 @@ static int do_ranks( hid_t fapl )
     {
         goto error;
     }
-    
+
 
     PASSED();
-   
-    
+
+
     return 0;
-    
-    
+
+
 error:
     return -1;
 }
@@ -327,23 +327,23 @@ error:
 */
 static int do_layouts( hid_t fapl )
 {
-    
+
     TESTING_2("storage layout use");
- 
+
     if (test_layouts( H5D_COMPACT, fapl ) < 0)
     {
         goto error;
-    } 
-    
+    }
+
     if (test_layouts( H5D_CONTIGUOUS, fapl ) < 0)
     {
         goto error;
-    } 
-    
+    }
+
     PASSED();
-    
+
     return 0;
-    
+
 error:
     return -1;
 }
@@ -353,33 +353,33 @@ error:
  *-------------------------------------------------------------------------
  */
 
-static int test_rank1( hbool_t do_compress, 
-                       hbool_t do_fill_value, 
+static int test_rank1( hbool_t do_compress,
+                       hbool_t do_fill_value,
                        hbool_t set_istore_k,
                        H5D_fill_time_t fill_time,
                        hid_t fapl)
 {
 
-    hid_t   fid=-1;          
+    hid_t   fid=-1;
     hid_t   did=-1;
     hid_t   sid=-1;
     hid_t   dcpl=-1;
     hid_t   fcpl;
-    hsize_t dims_o[RANK1] = {DIM0};   /* original dimensions */ 
-    hsize_t dims_s[RANK1] = {DIMS0};  /* shrinking dimensions */ 
-    hsize_t dims_e[RANK1] = {DIME0};  /* extended dimensions */ 
-    hsize_t dims_c[RANK1] = {2};      /* chunk dimensions */ 
-    hsize_t dims_r[RANK1];            /* read dimensions */ 
+    hsize_t dims_o[RANK1] = {DIM0};   /* original dimensions */
+    hsize_t dims_s[RANK1] = {DIMS0};  /* shrinking dimensions */
+    hsize_t dims_e[RANK1] = {DIME0};  /* extended dimensions */
+    hsize_t dims_c[RANK1] = {2};      /* chunk dimensions */
+    hsize_t dims_r[RANK1];            /* read dimensions */
     hsize_t maxdims[RANK1] = {H5S_UNLIMITED};
     int     buf_o[DIM0];
     int     buf_s[DIMS0];
     int     buf_e[DIME0];
     int     buf_r[DIM0];
     int     i;
-    int     fillvalue = 1; 
-    int     comp_value; 
+    int     fillvalue = 1;
+    int     comp_value;
     char    filename[NAME_BUF_SIZE];
-       
+
     if ( do_fill_value )
     {
         comp_value = fillvalue;
@@ -389,47 +389,47 @@ static int test_rank1( hbool_t do_compress,
         comp_value = 0;
     }
 
-        
+
     for( i = 0; i < DIM0; i++ )
     {
-        
+
         buf_o[i] = 2;
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) 
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
     {
         goto error;
     }
-    
+
     if  ( set_istore_k )
     {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0) 
+        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
         {
             goto error;
         }
-        
+
     }
     /* create a new file */
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) 
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
     {
         goto error;
     }
 
     /* close property list */
-    if(H5Pclose(fcpl) < 0) 
+    if(H5Pclose(fcpl) < 0)
     {
         goto error;
     }
-    
+
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0) 
+    if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
     {
         goto error;
     }
-    
+
     /* modify dataset creation properties, i.e. enable chunking. */
     if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
     {
@@ -446,176 +446,176 @@ static int test_rank1( hbool_t do_compress,
             goto error;
         }
 
-        if(H5Pset_fill_time(dcpl, fill_time) < 0) 
+        if(H5Pset_fill_time(dcpl, fill_time) < 0)
         {
             goto error;
         }
     }
     else
     {
-        
-        if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) 
+
+        if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         {
             goto error;
         }
-        
+
     }
     if (do_compress)
     {
-        if(H5Pset_deflate(dcpl, 9) < 0) 
+        if(H5Pset_deflate(dcpl, 9) < 0)
         {
             goto error;
         }
     }
-    
+
     /*-------------------------------------------------------------------------
     * create, write dataset
     *-------------------------------------------------------------------------
     */
-    
+
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
-    
+
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) 
+    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
     {
         goto error;
     }
-    
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++ )
     {
-        
+
         printf("%d ", buf_o[i]);
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
 
 
-    
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_e) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
-    
+
+
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
     {
-        if (dims_r[i] != dims_e[i]) 
+        if (dims_r[i] != dims_e[i])
             goto error;
     }
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         goto error;
 
-   
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
-        
+
         printf("%d ", buf_e[i]);
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
+
+
 
-    
-    
-    
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
-        
-        if ( i >= DIM0  ) 
+
+        if ( i >= DIM0  )
         {
-            if(buf_e[i] != comp_value) 
+            if(buf_e[i] != comp_value)
             {
                 printf("buf_e[%d] = %d\n", i, buf_e[i]);
                 printf("value = %d\n", comp_value);
                 goto error;
-            } 
-        } 
-        else 
+            }
+        }
+        else
         {
-            if(buf_e[i] != buf_o[i]) 
+            if(buf_e[i] != buf_o[i])
                 goto error;
         }
     }
-    
-    
-  
-    
+
+
+
+
     /*-------------------------------------------------------------------------
-    * shrink 
+    * shrink
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             goto error;
     }
 
@@ -624,8 +624,8 @@ static int test_rank1( hbool_t do_compress,
     /* for this case we close and reopen file */
     if ( set_istore_k )
     {
-        
-        if (H5Dclose(did) < 0) 
+
+        if (H5Dclose(did) < 0)
         {
             goto error;
         }
@@ -634,76 +634,76 @@ static int test_rank1( hbool_t do_compress,
             goto error;
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0) 
+        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
         {
             goto error;
         }
-        
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0) 
+
+        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
         {
             goto error;
         }
-        
-        
-        
+
+
+
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0) 
+    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
     {
         goto error;
     }
-    
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
-        
+
         printf("%d ", buf_s[i]);
     }
     printf("\n");
 
-#endif  
+#endif
+
+
 
 
-    
-    
     /* compare the read array with the shrinked array */
     for( i = 0; i < (int)dims_r[0]; i++ )
     {
-        
-        if (  buf_s[i] != buf_o[i] ) 
+
+        if (  buf_s[i] != buf_o[i] )
         {
             printf("buf_s[%d] = %d\n", i, buf_s[i]);
             printf("buf_o[%d] = %d\n", i, buf_o[i]);
             goto error;
-        } 
+        }
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * expand it back to original size
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array */
     if (H5Dset_extent(did, dims_o) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0) 
+    if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions. */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
@@ -714,53 +714,53 @@ static int test_rank1( hbool_t do_compress,
     {
         goto error;
     }
-    
-    
+
+
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
     {
-        if (dims_r[i] != dims_o[i]) 
+        if (dims_r[i] != dims_o[i])
             goto error;
     }
-    
-       
+
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         goto error;
-    
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
-        
+
         printf("%d ", buf_r[i]);
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
 
 
-    
     /* compare the read array with the original array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
-        
-        if (i >= DIMS0 ) 
+
+        if (i >= DIMS0 )
         {
-            if(buf_r[i] != comp_value) 
+            if(buf_r[i] != comp_value)
             {
                 printf("buf_r[%d] = %d\n", i, buf_r[i] );
                 printf("value = %d\n", comp_value);
                 goto error;
-            } 
-        } 
-        else 
+            }
+        }
+        else
         {
-            if(buf_r[i] != buf_o[i]) 
+            if(buf_r[i] != buf_o[i])
                 goto error;
         }
     }
-    
+
 
     /*-------------------------------------------------------------------------
     * shrink to 0
@@ -769,75 +769,75 @@ static int test_rank1( hbool_t do_compress,
     */
 
     dims_s[0] = 0;
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK1; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             goto error;
-    }    
-    
+    }
+
     /*-------------------------------------------------------------------------
     * close dataset
     *-------------------------------------------------------------------------
     */
-    
-    if (H5Dclose(did) < 0) 
+
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
-   
-    
-   
-    
-    
+
+
+
+
+
      /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
-    
-      
-    if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0) 
+
+
+    if ((sid = H5Screate_simple(RANK1, dims_o, maxdims)) < 0)
     {
         goto error;
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
     /* set new dimensions for the array */
     dims_o[ 0 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0) 
+    if (H5Dset_extent( did , dims_o ) < 0)
     {
         goto error;
     }
 
 
 
-    if (H5Dclose(did) < 0) 
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
@@ -846,16 +846,16 @@ static int test_rank1( hbool_t do_compress,
         goto error;
     }
 
-    
-    
-    
+
+
+
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
-    
-    
-    if (H5Pclose(dcpl) < 0) 
+
+
+    if (H5Pclose(dcpl) < 0)
     {
         goto error;
     }
@@ -867,12 +867,12 @@ static int test_rank1( hbool_t do_compress,
 
 
     return 0;
-    
-    
-    
+
+
+
 error:
-    
-    H5E_BEGIN_TRY 
+
+    H5E_BEGIN_TRY
     {
         H5Dclose( did );
         H5Sclose( sid );
@@ -881,7 +881,7 @@ error:
         H5Fclose( fid );
     } H5E_END_TRY;
     return -1;
-    
+
 }
 
 /*-------------------------------------------------------------------------
@@ -889,33 +889,33 @@ error:
  *-------------------------------------------------------------------------
  */
 
-static int test_rank2( hbool_t do_compress, 
-                       hbool_t do_fill_value, 
+static int test_rank2( hbool_t do_compress,
+                       hbool_t do_fill_value,
                        hbool_t set_istore_k,
                        H5D_fill_time_t fill_time,
                        hid_t fapl)
 {
 
-    hid_t   fid=-1;          
+    hid_t   fid=-1;
     hid_t   did=-1;
     hid_t   sid=-1;
     hid_t   dcpl=-1;
     hid_t   fcpl;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */ 
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */ 
-    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */ 
-    hsize_t dims_c[RANK2] = {2,2};          /* chunk dimensions */ 
-    hsize_t dims_r[RANK2];                  /* read dimensions */ 
+    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
+    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */
+    hsize_t dims_c[RANK2] = {2,2};          /* chunk dimensions */
+    hsize_t dims_r[RANK2];                  /* read dimensions */
     hsize_t maxdims[RANK2] = {H5S_UNLIMITED,H5S_UNLIMITED};
     int     buf_o[DIM0][DIM1];
     int     buf_s[DIMS0][DIMS1];
     int     buf_e[DIME0][DIME1];
     int     buf_r[DIM0][DIM1];
     int     i, j;
-    int     fillvalue = 1; 
-    int     comp_value; 
+    int     fillvalue = 1;
+    int     comp_value;
     char    filename[NAME_BUF_SIZE];
-       
+
     if ( do_fill_value )
     {
         comp_value = fillvalue;
@@ -925,7 +925,7 @@ static int test_rank2( hbool_t do_compress,
         comp_value = 0;
     }
 
-        
+
     for( i = 0; i < DIM0; i++ )
     {
         for( j = 0; j < DIM1; j++ )
@@ -935,36 +935,36 @@ static int test_rank2( hbool_t do_compress,
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) 
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
     {
         goto error;
     }
-    
+
     if  ( set_istore_k )
     {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0) 
+        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
         {
             goto error;
         }
-        
+
     }
-    
+
     /* create a new file */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) 
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
     {
         goto error;
     }
 
-   
-    
+
+
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) 
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
     {
         goto error;
     }
-    
+
     /* modify dataset creation properties, i.e. enable chunking. */
     if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
     {
@@ -981,33 +981,33 @@ static int test_rank2( hbool_t do_compress,
             goto error;
         }
 
-        if(H5Pset_fill_time(dcpl, fill_time) < 0) 
+        if(H5Pset_fill_time(dcpl, fill_time) < 0)
         {
             goto error;
         }
     }
     else
     {
-        
-        if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) 
+
+        if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         {
             goto error;
         }
-        
+
     }
     if (do_compress)
     {
-        if(H5Pset_deflate(dcpl, 9) < 0) 
+        if(H5Pset_deflate(dcpl, 9) < 0)
         {
             goto error;
         }
     }
-    
+
     /*-------------------------------------------------------------------------
     * Procedure 1
     * a.	Write an array AxB. These are the dimensions for creating the dataset
     * b.	Define a greater array CxD where C > A and D > B
-    * c.	Read data back 
+    * c.	Read data back
     * d.	Verify if new dimensions are C and D
     * e.	Verify if data from A to C and B to D is what it is to be expected
     *
@@ -1020,20 +1020,20 @@ static int test_rank2( hbool_t do_compress,
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
-    
+
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) 
+    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
     {
         goto error;
     }
-    
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG2)
     printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++ )
@@ -1044,15 +1044,15 @@ static int test_rank2( hbool_t do_compress,
         }
         printf("\n");
     }
-#endif  
+#endif
+
 
 
-    
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it
     * data is now, extended space was initialized with fill value or default value
@@ -1067,44 +1067,44 @@ static int test_rank2( hbool_t do_compress,
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_e) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
-    
+
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_e[i]) 
+        if (dims_r[i] != dims_e[i])
             goto error;
     }
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         goto error;
 
-   
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG2)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -1115,41 +1115,41 @@ static int test_rank2( hbool_t do_compress,
         }
         printf("\n");
     }
-#endif  
+#endif
+
+
+
 
-    
-    
-    
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
         for (j = 0; j < (int)dims_r[1]; j++ )
         {
-            if ( i >= DIM0 || j >= DIM1 ) 
+            if ( i >= DIM0 || j >= DIM1 )
             {
-                if(buf_e[i][j] != comp_value) 
+                if(buf_e[i][j] != comp_value)
                 {
                     printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
                     printf("value = %d\n", comp_value);
                     goto error;
-                } 
-            } 
-            else 
+                }
+            }
+            else
             {
-                if(buf_e[i][j] != buf_o[i][j]) 
+                if(buf_e[i][j] != buf_o[i][j])
                     goto error;
             }
         }
     }
-    
-    
-  
-    
+
+
+
+
     /*-------------------------------------------------------------------------
     *
     * Procedure 2
     * a.	Define a smaller array ExF where E < A and F < B
-    * b.	Read data back 
+    * b.	Read data back
     * c.	Verify if new dimensions are E and F
     * d.	Verify if data up until E and F is what to be expected
     *
@@ -1160,34 +1160,34 @@ static int test_rank2( hbool_t do_compress,
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             goto error;
     }
 
@@ -1196,8 +1196,8 @@ static int test_rank2( hbool_t do_compress,
     /* for this case we close and reopen file */
     if ( set_istore_k )
     {
-        
-        if (H5Dclose(did) < 0) 
+
+        if (H5Dclose(did) < 0)
         {
             goto error;
         }
@@ -1206,32 +1206,32 @@ static int test_rank2( hbool_t do_compress,
             goto error;
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0) 
+        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
         {
             goto error;
         }
-        
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0) 
+
+        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
         {
             goto error;
         }
-        
-        
-        
+
+
+
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0) 
+    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
     {
         goto error;
     }
-    
+
 #if defined (H5_SET_EXTENT_DEBUG2)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -1242,26 +1242,26 @@ static int test_rank2( hbool_t do_compress,
         }
         printf("\n");
     }
-#endif  
+#endif
+
+
 
 
-    
-    
     /* compare the read array with the shrinked array */
     for( i = 0; i < (int)dims_r[0]; i++ )
     {
         for( j = 0; j < (int)dims_r[1]; j++ )
         {
-            if (  buf_s[i][j] != buf_o[i][j] ) 
+            if (  buf_s[i][j] != buf_o[i][j] )
             {
                 printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
                 printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 goto error;
-            } 
+            }
         }
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it back to original size
     * data is now, extended space was initialized with fill value or default value
@@ -1273,19 +1273,19 @@ static int test_rank2( hbool_t do_compress,
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array */
     if (H5Dset_extent(did, dims_o) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0) 
+    if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions. */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
@@ -1296,24 +1296,24 @@ static int test_rank2( hbool_t do_compress,
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_o[i]) 
+        if (dims_r[i] != dims_o[i])
             goto error;
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         goto error;
-    
+
 #if defined (H5_SET_EXTENT_DEBUG2)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -1324,27 +1324,27 @@ static int test_rank2( hbool_t do_compress,
         }
         printf("\n");
     }
-#endif  
+#endif
+
 
 
-    
     /* compare the read array with the original array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
         for (j = 0; j < (int)dims_r[1]; j++ )
         {
-            if (i >= DIMS0 || j >= DIMS1) 
+            if (i >= DIMS0 || j >= DIMS1)
             {
-                if(buf_r[i][j] != comp_value) 
+                if(buf_r[i][j] != comp_value)
                 {
                     printf("buf_r[%d][%d] = %d\n", i, j, buf_r[i][j]);
                     printf("value = %d\n", comp_value);
                     goto error;
-                } 
-            } 
-            else 
+                }
+            }
+            else
             {
-                if(buf_r[i][j] != buf_o[i][j]) 
+                if(buf_r[i][j] != buf_o[i][j])
                     goto error;
             }
         }
@@ -1358,74 +1358,74 @@ static int test_rank2( hbool_t do_compress,
 
     dims_s[0] = 0;
     dims_s[1] = 0;
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             goto error;
-    }    
-    
-    
+    }
+
+
     /*-------------------------------------------------------------------------
-    * close dataset 
+    * close dataset
     *-------------------------------------------------------------------------
     */
-    
-    if (H5Dclose(did) < 0) 
+
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
-       
-    
+
+
      /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
-    
-      
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) 
+
+
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
     {
         goto error;
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
     /* set new dimensions for the array */
     dims_o[ 0 ] = 0;
     dims_o[ 1 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0) 
+    if (H5Dset_extent( did , dims_o ) < 0)
     {
         goto error;
     }
 
 
 
-    if (H5Dclose(did) < 0) 
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
@@ -1434,22 +1434,22 @@ static int test_rank2( hbool_t do_compress,
         goto error;
     }
 
-    
-    
-    
+
+
+
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
-    
-    
-    if (H5Pclose(dcpl) < 0) 
+
+
+    if (H5Pclose(dcpl) < 0)
     {
         goto error;
     }
 
     /* close file creation property list */
-    if(H5Pclose(fcpl) < 0) 
+    if(H5Pclose(fcpl) < 0)
     {
         goto error;
     }
@@ -1461,12 +1461,12 @@ static int test_rank2( hbool_t do_compress,
 
 
     return 0;
-    
-    
-    
+
+
+
 error:
-    
-    H5E_BEGIN_TRY 
+
+    H5E_BEGIN_TRY
     {
         H5Dclose( did );
         H5Sclose( sid );
@@ -1475,7 +1475,7 @@ error:
         H5Fclose( fid );
     } H5E_END_TRY;
     return -1;
-    
+
 }
 
 
@@ -1486,33 +1486,33 @@ error:
  *-------------------------------------------------------------------------
  */
 
-static int test_rank3( hbool_t do_compress, 
-                       hbool_t do_fill_value, 
+static int test_rank3( hbool_t do_compress,
+                       hbool_t do_fill_value,
                        hbool_t set_istore_k,
                        H5D_fill_time_t fill_time,
                        hid_t fapl)
 {
 
-    hid_t   fid=-1;          
+    hid_t   fid=-1;
     hid_t   did=-1;
     hid_t   sid=-1;
     hid_t   dcpl=-1;
     hid_t   fcpl;
-    hsize_t dims_o[RANK3] = {DIM0,DIM1,DIM2};    /* original dimensions */ 
-    hsize_t dims_s[RANK3] = {DIMS0,DIMS1,DIMS2}; /* shrinking dimensions */ 
-    hsize_t dims_e[RANK3] = {DIME0,DIME1,DIME2}; /* extended dimensions */ 
-    hsize_t dims_c[RANK3] = {2,2,2};             /* chunk dimensions */ 
-    hsize_t dims_r[RANK3];                       /* read dimensions */ 
+    hsize_t dims_o[RANK3] = {DIM0,DIM1,DIM2};    /* original dimensions */
+    hsize_t dims_s[RANK3] = {DIMS0,DIMS1,DIMS2}; /* shrinking dimensions */
+    hsize_t dims_e[RANK3] = {DIME0,DIME1,DIME2}; /* extended dimensions */
+    hsize_t dims_c[RANK3] = {2,2,2};             /* chunk dimensions */
+    hsize_t dims_r[RANK3];                       /* read dimensions */
     hsize_t maxdims[RANK3] = {H5S_UNLIMITED,H5S_UNLIMITED,H5S_UNLIMITED};
     int     buf_o[DIM0][DIM1][DIM2];
     int     buf_s[DIMS0][DIMS1][DIMS2];
     int     buf_e[DIME0][DIME1][DIME2];
     int     buf_r[DIM0][DIM1][DIM2];
     int     i, j, k;
-    int     fillvalue = 1; 
-    int     comp_value; 
+    int     fillvalue = 1;
+    int     comp_value;
     char	filename[NAME_BUF_SIZE];
-       
+
     if ( do_fill_value )
     {
         comp_value = fillvalue;
@@ -1522,7 +1522,7 @@ static int test_rank3( hbool_t do_compress,
         comp_value = 0;
     }
 
-        
+
     for( i = 0; i < DIM0; i++ )
     {
         for( j = 0; j < DIM1; j++ )
@@ -1535,39 +1535,39 @@ static int test_rank3( hbool_t do_compress,
     }
 
     /* create a file creation property list */
-    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) 
+    if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
     {
         goto error;
     }
-    
+
     if  ( set_istore_k )
     {
         /* set non-default indexed storage B-tree internal 'K' value */
-        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0) 
+        if (H5Pset_istore_k(fcpl,ISTORE_IK) < 0)
         {
             goto error;
         }
-        
+
     }
     /* create a new file */
     h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0) 
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
     {
         goto error;
     }
 
     /* close property list */
-    if(H5Pclose(fcpl) < 0) 
+    if(H5Pclose(fcpl) < 0)
     {
         goto error;
     }
-    
+
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) 
+    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
     {
         goto error;
     }
-    
+
     /* modify dataset creation properties, i.e. enable chunking. */
     if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
     {
@@ -1584,46 +1584,46 @@ static int test_rank3( hbool_t do_compress,
             goto error;
         }
 
-        if(H5Pset_fill_time(dcpl, fill_time) < 0) 
+        if(H5Pset_fill_time(dcpl, fill_time) < 0)
         {
             goto error;
         }
     }
     else
     {
-        
-        if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) 
+
+        if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0)
         {
             goto error;
         }
-        
+
     }
     if (do_compress)
     {
-        if(H5Pset_deflate(dcpl, 9) < 0) 
+        if(H5Pset_deflate(dcpl, 9) < 0)
         {
             goto error;
         }
     }
-    
+
     /*-------------------------------------------------------------------------
     * create, write array
     *-------------------------------------------------------------------------
     */
-    
+
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
-    
+
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) 
+    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
     {
         goto error;
     }
-    
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG3)
     printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++ )
@@ -1637,61 +1637,61 @@ static int test_rank3( hbool_t do_compress,
             printf("[%d] ", j);
         }
         printf("\n");
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
 
 
-    
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_e) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
-    
+
+
     /* check dimensions */
     for( i = 0; i < RANK3; i++ )
     {
-        if (dims_r[i] != dims_e[i]) 
+        if (dims_r[i] != dims_e[i])
             goto error;
     }
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         goto error;
 
-   
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG3)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -1705,14 +1705,14 @@ static int test_rank3( hbool_t do_compress,
             printf("[%d] ", j);
         }
         printf("\n");
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
+
+
 
-    
-    
-    
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
@@ -1720,59 +1720,59 @@ static int test_rank3( hbool_t do_compress,
         {
             for( k = 0; k < (int)dims_r[2]; k++ )
             {
-                if ( i >= DIM0 || j >= DIM1 || k >= DIM2 ) 
+                if ( i >= DIM0 || j >= DIM1 || k >= DIM2 )
                 {
-                    if(buf_e[i][j][k] != comp_value) 
+                    if(buf_e[i][j][k] != comp_value)
                     {
                         printf("buf_e[%d][%d][%d] = %d\n", i, j, k, buf_e[i][j][k] );
                         printf("value = %d\n", comp_value);
                         goto error;
-                    } 
-                } 
-                else 
+                    }
+                }
+                else
                 {
-                    if(buf_e[i][j][k] != buf_o[i][j][k] ) 
+                    if(buf_e[i][j][k] != buf_o[i][j][k] )
                         goto error;
                 }
             }
         }
     }
-    
-    
-  
-    
+
+
+
+
     /*-------------------------------------------------------------------------
     * shrink
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK3; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             goto error;
     }
 
@@ -1781,8 +1781,8 @@ static int test_rank3( hbool_t do_compress,
     /* for this case we close and reopen file */
     if ( set_istore_k )
     {
-        
-        if (H5Dclose(did) < 0) 
+
+        if (H5Dclose(did) < 0)
         {
             goto error;
         }
@@ -1791,32 +1791,32 @@ static int test_rank3( hbool_t do_compress,
             goto error;
         }
 
-        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0) 
+        if ((fid = H5Fopen( filename, H5F_ACC_RDWR, fapl ))<0)
         {
             goto error;
         }
-        
-        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0) 
+
+        if ((did = H5Dopen2( fid , "dset1", H5P_DEFAULT ))<0)
         {
             goto error;
         }
-        
-        
-        
+
+
+
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0) 
+    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
     {
         goto error;
     }
-    
+
 #if defined (H5_SET_EXTENT_DEBUG3)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -1830,14 +1830,14 @@ static int test_rank3( hbool_t do_compress,
              printf("[%d] ", j);
         }
         printf("\n");
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
+
 
 
-    
-    
     /* compare the read array with the shrinked array */
     for( i = 0; i < (int)dims_r[0]; i++ )
     {
@@ -1845,34 +1845,34 @@ static int test_rank3( hbool_t do_compress,
         {
             for( k = 0; k < (int)dims_r[2]; k++ )
             {
-                if (  buf_s[i][j][k] != buf_o[i][j][k] ) 
+                if (  buf_s[i][j][k] != buf_o[i][j][k] )
                 {
                     printf("buf_s[%d][%d][%d] = %d\n", i, j, k, buf_s[i][j][k] );
                     printf("buf_o[%d][%d][%d] = %d\n", i, j, k, buf_o[i][j][k] );
                     goto error;
-                } 
+                }
             }
         }
     }
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * set new dimensions for the array; expand it back to original size
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array */
     if (H5Dset_extent(did, dims_o) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
-    if ((sid = H5Dget_space(did)) < 0) 
+    if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions. */
     if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
@@ -1883,18 +1883,18 @@ static int test_rank3( hbool_t do_compress,
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK3; i++ )
     {
-        if (dims_r[i] != dims_o[i]) 
+        if (dims_r[i] != dims_o[i])
             goto error;
     }
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         goto error;
-    
+
 #if defined (H5_SET_EXTENT_DEBUG3)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -1903,19 +1903,19 @@ static int test_rank3( hbool_t do_compress,
         {
             for( k = 0; k < (int)dims_r[2]; k++ )
             {
-                
+
                 printf("%d ", buf_r[i][j][k]);
             }
              printf("[%d] ", j);
         }
         printf("\n");
-        
+
     }
     printf("\n");
-#endif  
+#endif
+
 
 
-    
     /* compare the read array with the original array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
@@ -1923,24 +1923,24 @@ static int test_rank3( hbool_t do_compress,
         {
             for( k = 0; k < (int)dims_r[2]; k++ )
             {
-                if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2 ) 
+                if (i >= DIMS0 || j >= DIMS1 || k >= DIMS2 )
                 {
-                    if( buf_r[i][j][k] != comp_value ) 
+                    if( buf_r[i][j][k] != comp_value )
                     {
                         printf("buf_r[%d][%d][%d] = %d\n", i, j, k, buf_r[i][j][k] );
                         printf("value = %d\n", comp_value);
                         goto error;
-                    } 
-                } 
-                else 
+                    }
+                }
+                else
                 {
-                    if(buf_r[i][j][k] != buf_o[i][j][k]) 
+                    if(buf_r[i][j][k] != buf_o[i][j][k])
                         goto error;
                 }
             }
         }
     }
-    
+
 
     /*-------------------------------------------------------------------------
     * shrink to 0
@@ -1951,61 +1951,61 @@ static int test_rank3( hbool_t do_compress,
     dims_s[0] = 0;
     dims_s[1] = 0;
     dims_s[2] = 0;
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
     {
         goto error;
     }
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK3; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             goto error;
-    }    
-    
-    
-    
+    }
+
+
+
     /*-------------------------------------------------------------------------
-    * close dataset 
+    * close dataset
     *-------------------------------------------------------------------------
     */
-    
-    if (H5Dclose(did) < 0) 
+
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
-       
-    
+
+
     /*-------------------------------------------------------------------------
     * test a dataset with non initialized chunks
     *-------------------------------------------------------------------------
     */
-    
-      
-    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0) 
+
+
+    if ((sid = H5Screate_simple(RANK3, dims_o, maxdims)) < 0)
     {
         goto error;
     }
-    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
@@ -2013,14 +2013,14 @@ static int test_rank3( hbool_t do_compress,
     dims_o[ 0 ] = 0;
     dims_o[ 1 ] = 0;
     dims_o[ 2 ] = 0;
-    if (H5Dset_extent( did , dims_o ) < 0) 
+    if (H5Dset_extent( did , dims_o ) < 0)
     {
         goto error;
     }
 
 
 
-    if (H5Dclose(did) < 0) 
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
@@ -2029,16 +2029,16 @@ static int test_rank3( hbool_t do_compress,
         goto error;
     }
 
-    
-    
-    
+
+
+
     /*-------------------------------------------------------------------------
     * close property list
     *-------------------------------------------------------------------------
     */
-    
-    
-    if (H5Pclose(dcpl) < 0) 
+
+
+    if (H5Pclose(dcpl) < 0)
     {
         goto error;
     }
@@ -2050,12 +2050,12 @@ static int test_rank3( hbool_t do_compress,
 
 
     return 0;
-    
-    
-    
+
+
+
 error:
-    
-    H5E_BEGIN_TRY 
+
+    H5E_BEGIN_TRY
     {
         H5Dclose( did );
         H5Sclose( sid );
@@ -2064,7 +2064,7 @@ error:
         H5Fclose( fid );
     } H5E_END_TRY;
     return -1;
-    
+
 }
 
 
@@ -2075,32 +2075,32 @@ error:
 static int test_external( hid_t fapl )
 {
 
-    hid_t   fid=-1;       
+    hid_t   fid=-1;
     hid_t   did=-1;
     hid_t   sid=-1;
     hid_t   dcpl=-1;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */ 
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */ 
-    hsize_t dims_e[RANK2] = {DIME0,DIM1};   /* extended dimensions, dimension 1 is the original */ 
-    hsize_t dims_r[RANK2];                  /* read dimensions */ 
+    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
+    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = {DIME0,DIM1};   /* extended dimensions, dimension 1 is the original */
+    hsize_t dims_r[RANK2];                  /* read dimensions */
     hsize_t maxdims[RANK2] = {DIME0,DIM1};  /* only the first dimension can be extendible */
-    int     buf_o[DIM0][DIM1];              /* original buffer, for writing */  
-    int     buf_s[DIMS0][DIMS1];            /* shrinked buffer, for reading */  
-    int     buf_e[DIME0][DIM1];             /* extended buffer, for writing, dimension 1 is the original */    
-    int     buf_ro[DIM0][DIM1];             /* original buffer for reading */    
+    int     buf_o[DIM0][DIM1];              /* original buffer, for writing */
+    int     buf_s[DIMS0][DIMS1];            /* shrinked buffer, for reading */
+    int     buf_e[DIME0][DIM1];             /* extended buffer, for writing, dimension 1 is the original */
+    int     buf_ro[DIM0][DIM1];             /* original buffer for reading */
     int     i, j;
     int     comp_value = 0;
     char	filename[NAME_BUF_SIZE];
-   
+
 
     hsize_t size;        /* number of bytes reserved in the file for the data */
-    hsize_t max_size[2];	
-    
+    hsize_t max_size[2];
+
     max_size[0] = dims_e[0];
     max_size[1] = dims_e[1];
     size = max_size[0] * max_size[1] * sizeof(int) / 2;
-    
-      
+
+
     for( i = 0; i < DIM0; i++ )
     {
         for( j = 0; j < DIM1; j++ )
@@ -2110,32 +2110,32 @@ static int test_external( hid_t fapl )
     }
 
     TESTING_2("external file use");
-  
+
     /* create a new file */
     h5_fixname(FILENAME[3], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) 
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
-  
+
     /* modify dataset creation properties */
     if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    
+
     if(H5Pset_external(dcpl, EXT_FILE_NAME1, (off_t)0, size) < 0)
         FAIL_STACK_ERROR
 
     if(H5Pset_external(dcpl, EXT_FILE_NAME2, (off_t)0, size) < 0)
         FAIL_STACK_ERROR
-    
+
     {
-        
+
         char	name[256];		/*external file name		*/
         off_t	file_offset;    /*external file offset		*/
         hsize_t	file_size;		/*sizeof external file segment	*/
-        
+
         if(H5Pget_external(dcpl, 0, sizeof(name), name, &file_offset,
                 &file_size) < 0)
             FAIL_STACK_ERROR
-        
+
     }
 
 
@@ -2155,11 +2155,11 @@ static int test_external( hid_t fapl )
 
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0) 
+    if ((sid = H5Screate_simple(RANK2, dims_o, maxdims)) < 0)
         FAIL_STACK_ERROR
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) 
+    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
         FAIL_STACK_ERROR
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
@@ -2171,9 +2171,9 @@ static int test_external( hid_t fapl )
     */
 
      /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ro) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ro) < 0)
         FAIL_STACK_ERROR
-    
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++ )
@@ -2184,10 +2184,10 @@ static int test_external( hid_t fapl )
         }
         printf("\n");
     }
-#endif  
+#endif
+
 
 
-    
     /*-------------------------------------------------------------------------
     * expand
     *-------------------------------------------------------------------------
@@ -2197,13 +2197,13 @@ static int test_external( hid_t fapl )
     * set new dimensions for the array; expand it
     * data is now, extended space was initialized with default value
     *
-    *  2 2 2 2 
-    *  2 2 2 2 
-    *  2 2 2 2 
-    *  2 2 2 2 
-    *  0 0 0 0 
-    *  0 0 0 0 
-    *  0 0 0 0 
+    *  2 2 2 2
+    *  2 2 2 2
+    *  2 2 2 2
+    *  2 2 2 2
+    *  0 0 0 0
+    *  0 0 0 0
+    *  0 0 0 0
     *
     *-------------------------------------------------------------------------
     */
@@ -2215,28 +2215,28 @@ static int test_external( hid_t fapl )
      /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
         FAIL_STACK_ERROR
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         FAIL_STACK_ERROR
-    
+
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
-    
-    
+
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_e[i]) 
+        if (dims_r[i] != dims_e[i])
             TEST_ERROR
     }
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_e) < 0)
         FAIL_STACK_ERROR
 
-   
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -2247,33 +2247,33 @@ static int test_external( hid_t fapl )
         }
         printf("\n");
     }
-#endif  
+#endif
+
+
+
 
-    
-    
-    
     /* compare the read array with the expanded array */
     for (i = 0; i < (int)dims_r[0]; i++ )
     {
         for (j = 0; j < (int)dims_r[1]; j++ )
         {
-            if ( i >= DIM0 || j >= DIM1 ) 
+            if ( i >= DIM0 || j >= DIM1 )
             {
-                if(buf_e[i][j] != comp_value) 
+                if(buf_e[i][j] != comp_value)
                 {
                     printf("buf_e[%d][%d] = %d\n", i, j, buf_e[i][j]);
                     printf("value = %d\n", comp_value);
                     TEST_ERROR
-                } 
-            } 
-            else 
+                }
+            }
+            else
             {
-                if(buf_e[i][j] != buf_o[i][j]) 
+                if(buf_e[i][j] != buf_o[i][j])
                     TEST_ERROR
             }
         }
     }
-    
+
 
 
      /*-------------------------------------------------------------------------
@@ -2286,41 +2286,41 @@ static int test_external( hid_t fapl )
     *
     *-------------------------------------------------------------------------
     */
-    
+
     /* set new dimensions for the array. */
     if (H5Dset_extent(did , dims_s) < 0)
         FAIL_STACK_ERROR
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
         FAIL_STACK_ERROR
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
         FAIL_STACK_ERROR
-    
+
     if (H5Sclose(sid) < 0)
         FAIL_STACK_ERROR
-    
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_s[i]) 
+        if (dims_r[i] != dims_s[i])
             TEST_ERROR
     }
 
 
-    
-    
+
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0) 
+    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_s ) < 0)
         FAIL_STACK_ERROR
-    
+
 #if defined (H5_SET_EXTENT_DEBUG)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -2331,22 +2331,22 @@ static int test_external( hid_t fapl )
         }
         printf("\n");
     }
-#endif  
+#endif
+
+
 
 
-    
-    
     /* compare the read array with the shrinked array */
     for( i = 0; i < (int)dims_r[0]; i++ )
     {
         for( j = 0; j < (int)dims_r[1]; j++ )
         {
-            if (  buf_s[i][j] != buf_o[i][j] ) 
+            if (  buf_s[i][j] != buf_o[i][j] )
             {
                 printf("buf_s[%d][%d] = %d\n", i, j, buf_s[i][j]);
                 printf("buf_o[%d][%d] = %d\n", i, j, buf_o[i][j]);
                 TEST_ERROR
-            } 
+            }
         }
     }
 
@@ -2361,16 +2361,16 @@ static int test_external( hid_t fapl )
     dims_e[1] = DIME1;
 
 
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
-        
-        
+
+
         /* set new dimensions for the array. */
         if (H5Dset_extent(did , dims_e) == SUCCEED)
         {
             TEST_ERROR
         }
-        
+
     } H5E_END_TRY;
 
 
@@ -2379,9 +2379,9 @@ static int test_external( hid_t fapl )
     * close property list
     *-------------------------------------------------------------------------
     */
-    
-    
-    if (H5Pclose(dcpl) < 0) 
+
+
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR
 
     if (H5Dclose( did ) < 0)
@@ -2393,10 +2393,10 @@ static int test_external( hid_t fapl )
     PASSED();
 
     return 0;
-    
+
 error:
-    
-    H5E_BEGIN_TRY 
+
+    H5E_BEGIN_TRY
     {
         H5Dclose( did );
         H5Sclose( sid );
@@ -2414,19 +2414,19 @@ error:
 static int test_layouts( H5D_layout_t layout, hid_t fapl )
 {
 
-    hid_t   fid=-1;       
+    hid_t   fid=-1;
     hid_t   did=-1;
     hid_t   sid=-1;
     hid_t   dcpl=-1;
-    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */ 
-    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */ 
-    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */ 
-    hsize_t dims_r[RANK2];                  /* read dimensions */ 
+    hsize_t dims_o[RANK2] = {DIM0,DIM1};    /* original dimensions */
+    hsize_t dims_s[RANK2] = {DIMS0,DIMS1};  /* shrinking dimensions */
+    hsize_t dims_e[RANK2] = {DIME0,DIME1};  /* extended dimensions */
+    hsize_t dims_r[RANK2];                  /* read dimensions */
     int     buf_o[DIM0][DIM1];
     int     buf_r[DIM0][DIM1];
-    int     i, j; 
+    int     i, j;
     char	filename[NAME_BUF_SIZE];
-   
+
     for( i = 0; i < DIM0; i++ )
     {
         for( j = 0; j < DIM1; j++ )
@@ -2435,44 +2435,44 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
         }
     }
 
-  
+
     /* create a new file */
     h5_fixname(FILENAME[4], fapl, filename, sizeof filename);
-    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) 
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
     {
         goto error;
     }
 
     /* create the data space with unlimited dimensions. */
-    if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0) 
+    if ((sid = H5Screate_simple(RANK2, dims_o, NULL)) < 0)
     {
         goto error;
     }
-    
+
     /* modify dataset creation properties */
     if ((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
     {
         goto error;
     }
-    
+
     if (H5Pset_layout (dcpl, layout) < 0)
     {
         goto error;
     }
-         
+
     /* create a dataset */
-    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) 
+    if ((did = H5Dcreate2(fid , "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
     {
         goto error;
     }
-    
+
     /* write */
-    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0) 
+    if (H5Dwrite(did , H5T_NATIVE_INT, sid, H5S_ALL, H5P_DEFAULT, buf_o) < 0)
     {
         goto error;
     }
-    
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG4)
     printf("\n");
     for (i = 0; i < (int)dims_o[0]; i++ )
@@ -2483,65 +2483,65 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
         }
         printf("\n");
     }
-#endif  
+#endif
+
 
 
-    
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /*-------------------------------------------------------------------------
     * negative test
-    * try to extend dimension 
+    * try to extend dimension
     *-------------------------------------------------------------------------
     */
 
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
-     
+
         if (H5Dset_extent(did , dims_e) == SUCCEED)
         {
             goto error;
         }
-        
+
     } H5E_END_TRY;
 
-    
-  
-    
+
+
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
-    
+
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_o[i]) 
+        if (dims_r[i] != dims_o[i])
             goto error;
     }
-    
+
     /* read */
-    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0) 
+    if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r) < 0)
         goto error;
 
-   
-    
+
+
 #if defined (H5_SET_EXTENT_DEBUG4)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -2552,63 +2552,63 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
         }
         printf("\n");
     }
-#endif  
+#endif
+
+
 
-     
-    
     /*-------------------------------------------------------------------------
     * negative test
-    * try to shrink dimension 
+    * try to shrink dimension
     *-------------------------------------------------------------------------
     */
 
-    H5E_BEGIN_TRY 
+    H5E_BEGIN_TRY
     {
-     
+
         if (H5Dset_extent(did , dims_s) == SUCCEED)
         {
             goto error;
         }
-        
+
     } H5E_END_TRY;
 
-    
+
     /* get the space */
     if ((sid = H5Dget_space(did)) < 0)
     {
         goto error;
     }
-    
+
     /* get dimensions */
-    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0) 
+    if (H5Sget_simple_extent_dims(sid, dims_r, NULL) < 0)
     {
         goto error;
     }
-    
+
     if (H5Sclose(sid) < 0)
     {
         goto error;
     }
-    
+
     /* check dimensions */
     for( i = 0; i < RANK2; i++ )
     {
-        if (dims_r[i] != dims_o[i]) 
+        if (dims_r[i] != dims_o[i])
             goto error;
     }
 
-    
+
     /*-------------------------------------------------------------------------
     * read
     *-------------------------------------------------------------------------
     */
-    
+
     /* read */
-    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r ) < 0) 
+    if (H5Dread( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_r ) < 0)
     {
         goto error;
     }
-    
+
 #if defined (H5_SET_EXTENT_DEBUG4)
     printf("\n");
     for (i = 0; i < (int)dims_r[0]; i++ )
@@ -2619,21 +2619,21 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
         }
         printf("\n");
     }
-#endif  
+#endif
+
 
 
-     
     /*-------------------------------------------------------------------------
-    * close 
+    * close
     *-------------------------------------------------------------------------
     */
-    
-    if (H5Dclose(did) < 0) 
+
+    if (H5Dclose(did) < 0)
     {
         goto error;
     }
-      
-    if (H5Pclose(dcpl) < 0) 
+
+    if (H5Pclose(dcpl) < 0)
     {
         goto error;
     }
@@ -2645,12 +2645,12 @@ static int test_layouts( H5D_layout_t layout, hid_t fapl )
 
 
     return 0;
-    
-    
-    
+
+
+
 error:
-    
-    H5E_BEGIN_TRY 
+
+    H5E_BEGIN_TRY
     {
         H5Dclose( did );
         H5Sclose( sid );
@@ -2658,6 +2658,6 @@ error:
         H5Fclose( fid );
     } H5E_END_TRY;
     return -1;
-    
+
 }