[svn-r14199] Description:

	Add H5Dcreate to API versioned routines, replacing internal usage with
H5Dcreate2

	Fix thread-safe error stack initialization for API versioned error
stack printing routines.

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, 513 insertions, 518 deletions

diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 604da3a..8fb8604 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -78,14 +78,14 @@ int main(void)
 {
  int nerrors=0;
 
- nerrors += test_simple()<0  ?1:0;
- nerrors += test_errors()<0  ?1:0;
- nerrors += test_rank()<0  ?1:0;
- nerrors += test_iterators()<0  ?1:0;
- nerrors += test_types()<0  ?1:0;
- nerrors += test_data()<0  ?1:0;
-
- if (nerrors) goto error;
+ nerrors += test_simple() < 0  ?1:0;
+ nerrors += test_errors() < 0  ?1:0;
+ nerrors += test_rank() < 0  ?1:0;
+ nerrors += test_iterators() < 0  ?1:0;
+ nerrors += test_types() < 0  ?1:0;
+ nerrors += test_data() < 0  ?1:0;
+
+ if(nerrors) goto error;
  printf("All dimension scales tests passed.\n");
  return 0;
 
@@ -159,7 +159,7 @@ static int test_simple(void)
  */
 
  /* create a file using default properties */
- if ((fid=H5Fcreate(FILE1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+ if((fid=H5Fcreate(FILE1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -168,27 +168,27 @@ static int test_simple(void)
  */
 
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_a",rank,dims,buf)<0)
+ if(H5LTmake_dataset_int(fid,"dset_a",rank,dims,buf) < 0)
   goto out;
 
  /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_int(fid,DS_1_NAME,rankds,s1_dim,s1_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,DS_1_NAME,rankds,s1_dim,s1_wbuf) < 0)
   goto out;
 
  /* make a DS dataset with an alternate scale for the 2nd dimension  */
- if (H5LTmake_dataset_int(fid,DS_11_NAME,rankds,s1_dim,s11_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,DS_11_NAME,rankds,s1_dim,s11_wbuf) < 0)
   goto out;
 
  /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset_int(fid,DS_2_NAME,rankds,s2_dim,s2_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,DS_2_NAME,rankds,s2_dim,s2_wbuf) < 0)
   goto out;
 
  /* make a DS dataset with an alternate scale for the 2nd dimension  */
- if (H5LTmake_dataset_int(fid,DS_21_NAME,rankds,s2_dim,s21_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,DS_21_NAME,rankds,s2_dim,s21_wbuf) < 0)
   goto out;
 
  /* make a DS dataset with an alternate scale for the 2nd dimension  */
- if (H5LTmake_dataset_int(fid,DS_22_NAME,rankds,s2_dim,s22_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,DS_22_NAME,rankds,s2_dim,s22_wbuf) < 0)
   goto out;
 
 
@@ -200,7 +200,7 @@ static int test_simple(void)
  TESTING2("attach scales");
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -209,15 +209,15 @@ static int test_simple(void)
  */
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach the DS_1_NAME dimension scale to "dset_a" at dimension 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -226,15 +226,15 @@ static int test_simple(void)
  */
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_11_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_11_NAME, H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach the DS_11_NAME dimension scale to "dset_a" at dimension 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -243,15 +243,15 @@ static int test_simple(void)
  */
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach the "ds2" dimension scale to "dset_a" as the 2nd dimension  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -260,15 +260,15 @@ static int test_simple(void)
  */
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach the DS_21_NAME dimension scale to "dset_a" as the 2nd dimension  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
 
   /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -277,15 +277,15 @@ static int test_simple(void)
  */
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
   goto out;
 
   /* attach the "ds22" dimension scale to "dset_a" as the 2nd dimension  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
 
   /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
 
@@ -295,37 +295,37 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM0)<=0)
+ if(H5DSis_attached(did,dsid,DIM0)<=0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
- if ((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM1)<=0)
+ if(H5DSis_attached(did,dsid,DIM1)<=0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
- if ((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM1)<=0)
+ if(H5DSis_attached(did,dsid,DIM1)<=0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
- if ((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM1)<=0)
+ if(H5DSis_attached(did,dsid,DIM1)<=0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
 
  /* close dataset ID of "dset_a" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 
@@ -345,23 +345,23 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* verify that "dset_a" has 1 dimension scale at DIM 0   */
- if ((nscales = H5DSget_num_scales(did,0))<0)
+ if((nscales = H5DSget_num_scales(did,0)) < 0)
   goto out;
- if (nscales!=2)
+ if(nscales!=2)
   goto out;
 
  /* verify that "dset_a" has 3 dimension scales at DIM 1   */
- if ((nscales = H5DSget_num_scales(did,1))<0)
+ if((nscales = H5DSget_num_scales(did,1)) < 0)
   goto out;
- if (nscales!=3)
+ if(nscales!=3)
   goto out;
 
  /* close dataset ID of "dset_a" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 
@@ -371,11 +371,11 @@ static int test_simple(void)
  */
 
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_b",rank,dims,buf)<0)
+ if(H5LTmake_dataset_int(fid,"dset_b",rank,dims,buf) < 0)
   goto out;
 
  /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_int(fid,"ds_b_1",rankds,s1_dim,s1_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,"ds_b_1",rankds,s1_dim,s1_wbuf) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -383,15 +383,15 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
   goto out;
- if ((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,0)<0)
+ if(H5DSattach_scale(did,dsid,0) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -400,23 +400,23 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_b" */
- if ((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
   goto out;
 
  /* verify that "dset_b" has 1 dimension scale at DIM 0   */
- if ((nscales = H5DSget_num_scales(did,0))<0)
+ if((nscales = H5DSget_num_scales(did,0)) < 0)
   goto out;
- if (nscales!=1)
+ if(nscales!=1)
   goto out;
 
  /* verify that "dset_b" has 0 dimension scales at DIM 1   */
- if ((nscales = H5DSget_num_scales(did,1))<0)
+ if((nscales = H5DSget_num_scales(did,1)) < 0)
   goto out;
- if (nscales!=0)
+ if(nscales!=0)
   goto out;
 
  /* close dataset ID of "dset_b" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -436,23 +436,23 @@ static int test_simple(void)
  */
 
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_c",rank,dims,buf)<0)
+ if(H5LTmake_dataset_int(fid,"dset_c",rank,dims,buf) < 0)
   goto out;
 
  /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_int(fid,"ds_c_1",rankds,s1_dim,s1_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,"ds_c_1",rankds,s1_dim,s1_wbuf) < 0)
   goto out;
 
  /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset_int(fid,"ds_c_2",rankds,s2_dim,s2_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,"ds_c_2",rankds,s2_dim,s2_wbuf) < 0)
   goto out;
 
  /* make a DS dataset with an alternate scale for the 2nd dimension  */
- if (H5LTmake_dataset_int(fid,"ds_c_21",rankds,s2_dim,s2_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,"ds_c_21",rankds,s2_dim,s2_wbuf) < 0)
   goto out;
 
  /* make a DS dataset with an alternate scale for the 2nd dimension  */
- if (H5LTmake_dataset_int(fid,"ds_c_22",rankds,s2_dim,s2_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,"ds_c_22",rankds,s2_dim,s2_wbuf) < 0)
   goto out;
 
 
@@ -461,38 +461,38 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_c_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_1", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,0)<0)
+ if(H5DSattach_scale(did,dsid,0) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,1)<0)
+ if(H5DSattach_scale(did,dsid,1) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,1)<0)
+ if(H5DSattach_scale(did,dsid,1) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,1)<0)
+ if(H5DSattach_scale(did,dsid,1) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -500,19 +500,19 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
  /* verify that "dset_c" has 1 dimension scale at DIM 0   */
- if ((nscales = H5DSget_num_scales(did,0))<0)
+ if((nscales = H5DSget_num_scales(did,0)) < 0)
   goto out;
- if (nscales!=1)
+ if(nscales!=1)
   goto out;
  /* verify that "dset_c" has 3 dimension scales at DIM 1   */
- if ((nscales = H5DSget_num_scales(did,1))<0)
+ if((nscales = H5DSget_num_scales(did,1)) < 0)
   goto out;
- if (nscales!=3)
+ if(nscales!=3)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -521,23 +521,23 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_c" */
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT)) < 0)
   goto out;
 
  /* detach the "ds_c_21" dimension scale to "dset_c" in DIM 1  */
- if (H5DSdetach_scale(did,dsid,1)<0)
+ if(H5DSdetach_scale(did,dsid,1) < 0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_c" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -545,14 +545,14 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
   /* verify that "dset_c" has 2 dimension scales at DIM 1  */
- if ((nscales = H5DSget_num_scales(did,1))<0)
+ if((nscales = H5DSget_num_scales(did,1)) < 0)
   goto out;
- if (nscales!=2)
+ if(nscales!=2)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -561,23 +561,23 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_c" */
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
   goto out;
 
  /* detach the "ds_c_22" dimension scale to "dset_c" in DIM 1  */
- if (H5DSdetach_scale(did,dsid,1)<0)
+ if(H5DSdetach_scale(did,dsid,1) < 0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_c" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -585,14 +585,14 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
   /* verify that "dset_c" has 1 dimension scale at DIM 1  */
- if ((nscales = H5DSget_num_scales(did,1))<0)
+ if((nscales = H5DSget_num_scales(did,1)) < 0)
   goto out;
- if (nscales!=1)
+ if(nscales!=1)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -601,23 +601,23 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_c" */
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT)) < 0)
   goto out;
 
  /* detach the "ds_c_2" dimension scale to "dset_c" in DIM 1  */
- if (H5DSdetach_scale(did,dsid,1)<0)
+ if(H5DSdetach_scale(did,dsid,1) < 0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_c" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -625,14 +625,14 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
   goto out;
   /* verify that "dset_c" has 1 dimension scale at DIM 1  */
- if ((nscales = H5DSget_num_scales(did,1))<0)
+ if((nscales = H5DSget_num_scales(did,1)) < 0)
   goto out;
- if (nscales!=0)
+ if(nscales!=0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 
@@ -640,34 +640,34 @@ static int test_simple(void)
  * create 3 datasets: 1 "data" dataset and 2 dimension scales
  *-------------------------------------------------------------------------
  */
- if (H5LTmake_dataset_int(fid,"dset_d",rank,dims,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"dset_d",rank,dims,NULL) < 0)
   goto out;
- if (H5LTmake_dataset_int(fid,"ds_d_1",rankds,s1_dim,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_d_1",rankds,s1_dim,NULL) < 0)
   goto out;
- if (H5LTmake_dataset_int(fid,"ds_d_2",rankds,s2_dim,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_d_2",rankds,s2_dim,NULL) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
  * attach them
  *-------------------------------------------------------------------------
  */
- if ((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,0)<0)
+ if(H5DSattach_scale(did,dsid,0) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if ((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,1)<0)
+ if(H5DSattach_scale(did,dsid,1) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -675,24 +675,24 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM0)<=0)
+ if(H5DSis_attached(did,dsid,DIM0)<=0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM1)<=0)
+ if(H5DSis_attached(did,dsid,DIM1)<=0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 
@@ -702,27 +702,27 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_d" */
- if ((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
   goto out;
 
  /* detach the dimension scale to "dset_d" in DIM 0  */
- if (H5DSdetach_scale(did,dsid,DIM0)<0)
+ if(H5DSdetach_scale(did,dsid,DIM0) < 0)
   goto out;
 
  /* verify attach, it must return 0 for no attach */
- if (H5DSis_attached(did,dsid,DIM0)!=0)
+ if(H5DSis_attached(did,dsid,DIM0)!=0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_d" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -731,33 +731,33 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_d" */
- if ((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach "ds_d_1" again in DIM 0  */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
 
  /* verify attach, it must return 1 for attach */
- if (H5DSis_attached(did,dsid,DIM0)!=1)
+ if(H5DSis_attached(did,dsid,DIM0)!=1)
   goto out;
 
  /* verify that "ds_d_1" has only 1 scale at DIM0  */
- if ((nscales = H5DSget_num_scales(did,DIM0))<0)
+ if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
   goto out;
- if (nscales!=1)
+ if(nscales!=1)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_d" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -766,37 +766,37 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_d" */
- if ((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
   goto out;
 
  /* detach the "ds_d_2" dimension scale to "dset_d" in DIM 1  */
- if (H5DSdetach_scale(did,dsid,DIM1)<0)
+ if(H5DSdetach_scale(did,dsid,DIM1) < 0)
   goto out;
 
  /* detach again, it should fail */
- if (H5DSdetach_scale(did,dsid,DIM1)==SUCCEED)
+ if(H5DSdetach_scale(did,dsid,DIM1)==SUCCEED)
   goto out;
 
  /* verify attach, it must return 0 for no attach */
- if (H5DSis_attached(did,dsid,DIM1)!=0)
+ if(H5DSis_attached(did,dsid,DIM1)!=0)
   goto out;
 
  /* verify that "ds_d_1" has no scale at DIM1  */
- if ((nscales = H5DSget_num_scales(did,DIM1))<0)
+ if((nscales = H5DSget_num_scales(did,DIM1)) < 0)
   goto out;
- if (nscales!=0)
+ if(nscales!=0)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_d" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -805,47 +805,47 @@ static int test_simple(void)
  */
 
  /* get the dataset id for "dset_d" */
- if ((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach "ds_d_2" in DIM 1  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
 
  /* verify attach, it must return 1 for attach */
- if (H5DSis_attached(did,dsid,DIM1)!=1)
+ if(H5DSis_attached(did,dsid,DIM1)!=1)
   goto out;
 
  /* verify that "ds_d_2" has only 1 scale at DIM1  */
- if ((nscales = H5DSget_num_scales(did,DIM0))<0)
+ if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
   goto out;
- if (nscales!=1)
+ if(nscales!=1)
   goto out;
 
  /* attach "ds_d_2" again in DIM 1  */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
 
  /* verify attach, it must return 1 for attach */
- if (H5DSis_attached(did,dsid,DIM1)!=1)
+ if(H5DSis_attached(did,dsid,DIM1)!=1)
   goto out;
 
  /* verify that "ds_d_2" has only 1 scale at DIM1  */
- if ((nscales = H5DSget_num_scales(did,DIM0))<0)
+ if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
   goto out;
- if (nscales!=1)
+ if(nscales != 1)
   goto out;
 
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  /* close dataset ID of "dset_d" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -858,22 +858,21 @@ static int test_simple(void)
   goto out;
 
  /* create the data space for the dataset */
- if ((sid=H5Screate_simple(rank,dims,NULL))<0)
+ if((sid = H5Screate_simple(rank,dims,NULL)) < 0)
   goto out;
 
- for (i=0; i<5; i++)
- {
+ for(i = 0; i < 5; i++) {
   sprintf(dname,"dset_%d",i);
-  if ((did = H5Dcreate(gid,dname,H5T_NATIVE_INT,sid,H5P_DEFAULT))<0)
+  if((did = H5Dcreate2(gid, dname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
    goto out;
   sprintf(sname,"ds_%d",i);
-  if((dsid = H5Dcreate(gid,sname,H5T_NATIVE_INT,sid,H5P_DEFAULT))<0)
+  if((dsid = H5Dcreate2(gid, sname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
    goto out;
-  if(H5DSset_scale(dsid,"scale")<0)
+  if(H5DSset_scale(dsid,"scale") < 0)
    goto out;
-  if (H5Dclose(dsid)<0)
+  if(H5Dclose(dsid) < 0)
    goto out;
-  if (H5Dclose(did)<0)
+  if(H5Dclose(did) < 0)
    goto out;
  }
 
@@ -882,22 +881,20 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- for (i=0; i<5; i++)
- {
-  sprintf(dname,"dset_%d",i);
-  if ((did = H5Dopen2(gid,dname, H5P_DEFAULT))<0)
+ for(i = 0; i < 5; i++) {
+  sprintf(dname, "dset_%d", i);
+  if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
    goto out;
-  for (j=0; j<5; j++)
-  {
-   sprintf(sname,"ds_%d",j);
-   if((dsid = H5Dopen2(gid,sname, H5P_DEFAULT))<0)
+  for(j = 0; j < 5; j++) {
+   sprintf(sname, "ds_%d", j);
+   if((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
     goto out;
-   if(H5DSattach_scale(did,dsid,DIM0)<0)
+   if(H5DSattach_scale(did, dsid, DIM0) < 0)
     goto out;
-   if (H5Dclose(dsid)<0)
+   if(H5Dclose(dsid) < 0)
     goto out;
   }
-  if (H5Dclose(did)<0)
+  if(H5Dclose(did) < 0)
    goto out;
  }
 
@@ -906,22 +903,20 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- for (i=0; i<5; i++)
- {
-  sprintf(dname,"dset_%d",i);
-  if ((did = H5Dopen2(gid,dname, H5P_DEFAULT))<0)
+ for(i = 0; i < 5; i++) {
+  sprintf(dname, "dset_%d", i);
+  if((did = H5Dopen2(gid, dname, H5P_DEFAULT)) < 0)
    goto out;
-  for (j=0; j<5; j++)
-  {
-   sprintf(sname,"ds_%d",j);
-   if((dsid = H5Dopen2(gid,sname, H5P_DEFAULT))<0)
+  for(j = 0; j < 5; j++) {
+   sprintf(sname, "ds_%d", j);
+   if((dsid = H5Dopen2(gid, sname, H5P_DEFAULT)) < 0)
     goto out;
-   if(H5DSdetach_scale(did,dsid,DIM0)<0)
+   if(H5DSdetach_scale(did, dsid, DIM0) < 0)
     goto out;
-   if (H5Dclose(dsid)<0)
+   if(H5Dclose(dsid) < 0)
     goto out;
   }
-  if (H5Dclose(did)<0)
+  if(H5Dclose(did) < 0)
    goto out;
  }
 
@@ -931,29 +926,29 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- for (i=0; i<5; i++)
+ for(i=0; i<5; i++)
  {
   sprintf(dname,"dset_%d",i);
-  if ((did = H5Dopen2(gid,dname, H5P_DEFAULT))<0)
+  if((did = H5Dopen2(gid,dname, H5P_DEFAULT)) < 0)
    goto out;
-  for (j=0; j<5; j++)
+  for(j=0; j<5; j++)
   {
    sprintf(sname,"ds_%d",j);
-   if((dsid = H5Dopen2(gid,sname, H5P_DEFAULT))<0)
+   if((dsid = H5Dopen2(gid,sname, H5P_DEFAULT)) < 0)
     goto out;
-   if(H5DSattach_scale(did,dsid,DIM0)<0)
+   if(H5DSattach_scale(did,dsid,DIM0) < 0)
     goto out;
-   if (H5Dclose(dsid)<0)
+   if(H5Dclose(dsid) < 0)
     goto out;
   }
-  if (H5Dclose(did)<0)
+  if(H5Dclose(did) < 0)
    goto out;
  }
 
  /* close */
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
 
 
@@ -968,30 +963,30 @@ static int test_simple(void)
  TESTING2("attach only to 1 dimension");
 
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_e",rank,dims,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"dset_e",rank,dims,NULL) < 0)
   goto out;
 
  /* make a scale */
- if (H5LTmake_dataset_int(fid,"ds_e_1",rankds,s1_dim,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_e_1",rankds,s1_dim,NULL) < 0)
   goto out;
 
  /* attach the DS to dimension 1 */
- if ((did = H5Dopen2(fid,"dset_e", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_e", H5P_DEFAULT)) < 0)
   goto out;
- if ((dsid = H5Dopen2(fid,"ds_e_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_e_1", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
- if (H5DSis_attached(did,dsid,DIM1)<=0)
+ if(H5DSis_attached(did,dsid,DIM1)<=0)
   goto out;
 
 
  /* try to detach all dimensions. for dimensions 0 and 2, it is an error */
- for (i=0; i<rank; i++)
+ for(i=0; i<rank; i++)
  {
-  if ( i==1 )
+  if( i==1 )
   {
-   if(H5DSdetach_scale(did,dsid,(unsigned)i)<0)
+   if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
     goto out;
   }
   else
@@ -1001,9 +996,9 @@ static int test_simple(void)
   }
  }
 
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -1016,7 +1011,7 @@ static int test_simple(void)
 
  TESTING2("set/get label");
 
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1024,9 +1019,9 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if (H5DSset_label(did,DIM0,DIM0_LABEL)<0)
+ if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
   goto out;
- if (H5DSset_label(did,DIM1,DIM1_LABEL)<0)
+ if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1034,14 +1029,14 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if (H5DSget_label(did,DIM0,dim0_label,sizeof(dim0_label))<0)
+ if(H5DSget_label(did,DIM0,dim0_label,sizeof(dim0_label)) < 0)
   goto out;
- if (H5DSget_label(did,DIM1,dim1_label,sizeof(dim1_label))<0)
+ if(H5DSget_label(did,DIM1,dim1_label,sizeof(dim1_label)) < 0)
   goto out;
 
- if (strcmp(DIM0_LABEL,dim0_label)!=0)
+ if(strcmp(DIM0_LABEL,dim0_label)!=0)
   goto out;
- if (strcmp(DIM1_LABEL,dim1_label)!=0)
+ if(strcmp(DIM1_LABEL,dim1_label)!=0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1049,33 +1044,33 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((dim0_label_size=H5DSget_label(did,DIM0,NULL,(size_t)0))<0)
+ if((dim0_label_size=H5DSget_label(did,DIM0,NULL,(size_t)0)) < 0)
   goto out;
- if ((dim1_label_size=H5DSget_label(did,DIM1,NULL,(size_t)0))<0)
+ if((dim1_label_size=H5DSget_label(did,DIM1,NULL,(size_t)0)) < 0)
   goto out;
 
  /* allocate */
  dim0_labeld = (char*)malloc(dim0_label_size * sizeof(char));
  dim1_labeld = (char*)malloc(dim1_label_size * sizeof(char));
- if ( dim0_labeld==NULL || dim1_labeld==NULL)
+ if( dim0_labeld==NULL || dim1_labeld==NULL)
   goto out;
 
- if (H5DSget_label(did,DIM0,dim0_labeld,(size_t)dim0_label_size)<0)
+ if(H5DSget_label(did,DIM0,dim0_labeld,(size_t)dim0_label_size) < 0)
   goto out;
- if (H5DSget_label(did,DIM1,dim1_labeld,(size_t)dim1_label_size)<0)
+ if(H5DSget_label(did,DIM1,dim1_labeld,(size_t)dim1_label_size) < 0)
   goto out;
 
- if (strncmp(DIM0_LABEL,dim0_labeld,(size_t)(dim0_label_size-1))!=0)
+ if(strncmp(DIM0_LABEL,dim0_labeld,(size_t)(dim0_label_size-1))!=0)
   goto out;
- if (strncmp(DIM1_LABEL,dim1_labeld,(size_t)(dim1_label_size-1))!=0)
+ if(strncmp(DIM1_LABEL,dim1_labeld,(size_t)(dim1_label_size-1))!=0)
   goto out;
 
- if (dim0_labeld)
+ if(dim0_labeld)
  {
   free(dim0_labeld);
   dim0_labeld=NULL;
  }
- if (dim1_labeld)
+ if(dim1_labeld)
  {
   free(dim1_labeld);
   dim1_labeld=NULL;
@@ -1087,19 +1082,19 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if (H5DSget_label(did,DIM0,dim0_labels,sizeof(dim0_labels))<0)
+ if(H5DSget_label(did,DIM0,dim0_labels,sizeof(dim0_labels)) < 0)
   goto out;
- if (H5DSget_label(did,DIM1,dim1_labels,sizeof(dim1_labels))<0)
+ if(H5DSget_label(did,DIM1,dim1_labels,sizeof(dim1_labels)) < 0)
   goto out;
 
- if (strncmp(DIM0_LABEL,dim0_label,sizeof(dim0_labels)-1)!=0)
+ if(strncmp(DIM0_LABEL,dim0_label,sizeof(dim0_labels)-1)!=0)
   goto out;
- if (strncmp(DIM1_LABEL,dim1_label,sizeof(dim1_labels)-1)!=0)
+ if(strncmp(DIM1_LABEL,dim1_label,sizeof(dim1_labels)-1)!=0)
   goto out;
 
 
 
- if (H5Dclose(did))
+ if(H5Dclose(did))
   goto out;
 
  PASSED();
@@ -1110,14 +1105,14 @@ static int test_simple(void)
  */
  TESTING2("set scale/get scale name");
 
- if ((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
   goto out;
 
- if (H5DSset_scale(dsid,SCALE_1_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
   goto out;
 
  /* verify that DS_1_NAME is a dimension scale dataset  */
- if ((H5DSis_scale(dsid))==0)
+ if((H5DSis_scale(dsid))==0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1126,22 +1121,22 @@ static int test_simple(void)
  */
 
  /* get the lenght of the scale name (pass NULL in name) */
- if ((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0))<0)
+ if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) < 0)
   goto out;
 
  /* allocate a  buffer */
  name_out = (char*)malloc(name_len * sizeof(char));
- if (name_out == NULL)
+ if(name_out == NULL)
   goto out;
 
  /* get the scale name using this buffer */
- if (H5DSget_scale_name(dsid,name_out,(size_t)name_len)<0)
+ if(H5DSget_scale_name(dsid,name_out,(size_t)name_len) < 0)
   goto out;
 
- if (strcmp(SCALE_1_NAME,name_out)!=0)
+ if(strcmp(SCALE_1_NAME,name_out)!=0)
   goto out;
 
- if (name_out)
+ if(name_out)
  {
   free(name_out);
   name_out=NULL;
@@ -1153,10 +1148,10 @@ static int test_simple(void)
  */
 
  /* get the scale name using this buffer */
- if (H5DSget_scale_name(dsid,sname,sizeof(sname))<0)
+ if(H5DSget_scale_name(dsid,sname,sizeof(sname)) < 0)
   goto out;
 
- if (strcmp(SCALE_1_NAME,sname)!=0)
+ if(strcmp(SCALE_1_NAME,sname)!=0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1165,13 +1160,13 @@ static int test_simple(void)
  */
 
  /* get the scale name using this buffer */
- if (H5DSget_scale_name(dsid,snames,sizeof(snames))<0)
+ if(H5DSget_scale_name(dsid,snames,sizeof(snames)) < 0)
   goto out;
 
- if (strncmp(SCALE_1_NAME,snames,sizeof(snames)-1)!=0)
+ if(strncmp(SCALE_1_NAME,snames,sizeof(snames)-1)!=0)
   goto out;
 
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1179,32 +1174,32 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
 
- if ((dsid = H5Dopen2(fid,DS_11_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_11_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSset_scale(dsid,SCALE_11_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_11_NAME) < 0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
- if ((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSset_scale(dsid,SCALE_2_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
- if ((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSset_scale(dsid,SCALE_21_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_21_NAME) < 0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
- if ((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSset_scale(dsid,SCALE_22_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_22_NAME) < 0)
   goto out;
- if (H5Dclose(dsid))
+ if(H5Dclose(dsid))
   goto out;
 
 
@@ -1217,13 +1212,13 @@ static int test_simple(void)
  TESTING2("iterate scales (verify scale)");
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  dim = 0;
 
  /* iterate trough the 1st dimension of "dset_a" and verify that its DS is valid  */
- if (H5DSiterate_scales(did,dim,NULL,verify_scale,NULL)<0)
+ if(H5DSiterate_scales(did,dim,NULL,verify_scale,NULL) < 0)
   goto out;
 
  /* iterate trough the 2nd dimension of "dset_a" and verify that its DS is valid
@@ -1231,11 +1226,11 @@ static int test_simple(void)
  dim = 1;
  scale_idx = 2;
 
- if (H5DSiterate_scales(did,dim,&scale_idx,verify_scale,NULL)<0)
+ if(H5DSiterate_scales(did,dim,&scale_idx,verify_scale,NULL) < 0)
   goto out;
 
  /* close dataset ID of "dset_a" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -1249,13 +1244,13 @@ static int test_simple(void)
 
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  dim = 0;
 
  /* iterate trough the 1st dimension of "dset_a" and read the DS  */
- if (H5DSiterate_scales(did,dim,NULL,read_scale,s1_wbuf)<0)
+ if(H5DSiterate_scales(did,dim,NULL,read_scale,s1_wbuf) < 0)
   goto out;
 
  /* iterate trough the 2nd dimension of "dset_a" and read the DS
@@ -1263,11 +1258,11 @@ static int test_simple(void)
  dim = 1;
  scale_idx = 2;
 
- if (H5DSiterate_scales(did,dim,&scale_idx,read_scale,s22_wbuf)<0)
+ if(H5DSiterate_scales(did,dim,&scale_idx,read_scale,s22_wbuf) < 0)
   goto out;
 
  /* close dataset ID of "dset_a" */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -1279,19 +1274,19 @@ static int test_simple(void)
  TESTING2("iterate scales (verify the scale sizes match)");
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get dataset space */
- if ((sid = H5Dget_space(did))<0)
+ if((sid = H5Dget_space(did)) < 0)
   goto out;
 
  /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid))<0)
+ if((rank=H5Sget_simple_extent_ndims(sid)) < 0)
   goto out;
 
  /* get dimensions of dataset */
- if (H5Sget_simple_extent_dims(sid,dims,NULL)<0)
+ if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
   goto out;
 
  {
@@ -1301,24 +1296,24 @@ static int test_simple(void)
   /* iterate trough all the dimensions  */
   for(dim=0; dim<(unsigned)rank; dim++)
   {
-   if ((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL))<0)
+   if((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL)) < 0)
     goto out;
 
    /* "dset_a" was defined with all dimension scales size matching the size of its dimensions */
-   if (match_size==0)
+   if(match_size==0)
     goto out;
 
    /* both DS_1_NAME and DS_2_NAME are the on the first index */
-   if (idx!=0)
+   if(idx!=0)
     goto out;
   }
  }
 
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
 
  PASSED();
@@ -1333,42 +1328,42 @@ static int test_simple(void)
  * create 3 datasets: 1 "data" dataset and dimension scales (some are empty)
  *-------------------------------------------------------------------------
  */
- if (H5LTmake_dataset_int(fid,"dset_f",rank,dims,buf)<0)
+ if(H5LTmake_dataset_int(fid,"dset_f",rank,dims,buf) < 0)
   goto out;
- if (H5LTmake_dataset_int(fid,"ds_f_1",rankds,s1_dim,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_f_1",rankds,s1_dim,NULL) < 0)
   goto out;
- if (H5LTmake_dataset_int(fid,"ds_f_11",rankds,s1_dim,s1_wbuf)<0)
+ if(H5LTmake_dataset_int(fid,"ds_f_11",rankds,s1_dim,s1_wbuf) < 0)
   goto out;
- if (H5LTmake_dataset_int(fid,"ds_f_2",rankds,s2_dim,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_f_2",rankds,s2_dim,NULL) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
  * attach them
  *-------------------------------------------------------------------------
  */
- if ((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
   goto out;
 
- if ((dsid = H5Dopen2(fid,"ds_f_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_f_1", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if ((dsid = H5Dopen2(fid,"ds_f_11", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_f_11", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if ((dsid = H5Dopen2(fid,"ds_f_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_f_2", H5P_DEFAULT)) < 0)
   goto out;
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1376,19 +1371,19 @@ static int test_simple(void)
  *-------------------------------------------------------------------------
  */
  /* get the dataset id for "dset_f" */
- if ((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get dataset space */
- if ((sid = H5Dget_space(did))<0)
+ if((sid = H5Dget_space(did)) < 0)
   goto out;
 
  /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid))<0)
+ if((rank=H5Sget_simple_extent_ndims(sid)) < 0)
   goto out;
 
  /* get dimensions of dataset */
- if (H5Sget_simple_extent_dims(sid,dims,NULL)<0)
+ if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
   goto out;
 
  {
@@ -1401,7 +1396,7 @@ static int test_simple(void)
    /* always start at 1st scale */
    idx=0;
 
-   if ((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL))<0)
+   if((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL)) < 0)
     goto out;
 
     /* "dset_e" was defined with :
@@ -1410,20 +1405,20 @@ static int test_simple(void)
    switch(dim)
    {
    case 0: /* for DIM 0, we get a valid scale at IDX 1 */
-    if (match_size!=1 && idx!=1)
+    if(match_size!=1 && idx!=1)
      goto out;
     break;
    case 1: /* for DIM 1, we get no valid scales */
-    if (match_size!=0 && idx!=0)
+    if(match_size!=0 && idx!=0)
      goto out;
    }/*switch*/
   }/*for*/
  }
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
 
  PASSED();
@@ -1483,7 +1478,7 @@ static herr_t verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visit
   */
 
  /* the parameter DS dataset must be a valid DS dataset */
- if ((H5DSis_scale(scale_id))==1)
+ if((H5DSis_scale(scale_id))==1)
  {
   ret = 1;
  }
@@ -1527,32 +1522,32 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor
  dim=dim;
 
  /* get space */
- if ((sid = H5Dget_space(scale_id))<0)
+ if((sid = H5Dget_space(scale_id)) < 0)
   goto out;
  /* get type */
- if ((tid = H5Dget_type(scale_id))<0)
+ if((tid = H5Dget_type(scale_id)) < 0)
    goto out;
  /* get size of the DS array */
- if ((nelmts = H5Sget_simple_extent_npoints(sid))<0)
+ if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
   goto out;
  /* get type */
- if ((mtid=H5Tget_native_type(tid,H5T_DIR_DEFAULT))<0)
+ if((mtid=H5Tget_native_type(tid,H5T_DIR_DEFAULT)) < 0)
   goto out;
  /* get type size */
- if ((size=H5Tget_size(mtid))==0)
+ if((size=H5Tget_size(mtid))==0)
   goto out;
 
- if (nelmts)
+ if(nelmts)
  {
   buf=(char *) malloc((size_t)(nelmts*size));
-  if ( buf==NULL)
+  if( buf==NULL)
    goto out;
-  if (H5Dread(scale_id,mtid,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
+  if(H5Dread(scale_id,mtid,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf) < 0)
    goto out;
 
   for(i=0; i<nelmts; i++)
   {
-   if (buf[i] != data[i])
+   if(buf[i] != data[i])
    {
     printf("read and write buffers differ\n");
     goto out;
@@ -1561,13 +1556,13 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor
 
  } /* if */
 
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
- if (H5Tclose(tid)<0)
+ if(H5Tclose(tid) < 0)
   goto out;
- if (H5Tclose(mtid)<0)
+ if(H5Tclose(mtid) < 0)
   goto out;
- if (buf)
+ if(buf)
   free(buf);
 
 
@@ -1579,7 +1574,7 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor
   H5Sclose(sid);
   H5Tclose(tid);
   H5Tclose(mtid);
-  if (buf)
+  if(buf)
    free(buf);
  } H5E_END_TRY;
 
@@ -1621,15 +1616,15 @@ static herr_t match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor
  */
 
  /* get dataset space */
- if ((sid = H5Dget_space(did))<0)
+ if((sid = H5Dget_space(did)) < 0)
   goto out;
 
  /* get dimensions of dataset */
- if (H5Sget_simple_extent_dims(sid,dims,NULL)<0)
+ if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
   goto out;
 
  /* close the dataspace id */
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1638,25 +1633,25 @@ static herr_t match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor
  */
 
  /* get the space for the scale */
- if ((sid = H5Dget_space(dsid))<0)
+ if((sid = H5Dget_space(dsid)) < 0)
   goto out;
 
  /* get size of the DS array */
- if ((nelmts = H5Sget_simple_extent_npoints(sid))<0)
+ if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
   goto out;
 
  /* close */
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
 
  /* the size of the DS array must match the dimension of the dataset */
- if (nelmts == (hssize_t)dims[dim])
+ if(nelmts == (hssize_t)dims[dim])
   ret = 1;
 
  /* if the scale is empty assume it cannot be used */
  storage_size=H5Dget_storage_size(dsid);
 
- if (storage_size==0)
+ if(storage_size==0)
   ret = 0;
 
  return ret;
@@ -1730,22 +1725,22 @@ static int test_errors(void)
  */
 
  /* create a file using default properties */
- if ((fid=H5Fcreate(FILE2,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+ if((fid = H5Fcreate(FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
  /* create a group */
  if((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
  /* create the data space for the dataset */
- if ((sid=H5Screate_simple(rank,dims,NULL))<0)
+ if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
   goto out;
  /* create the data space for the scale */
- if ((sidds=H5Screate_simple(rankds,s1_dim,NULL))<0)
+ if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
   goto out;
   /* create a dataset */
- if ((did=H5Dcreate(fid,"dset_a",H5T_NATIVE_INT,sid,H5P_DEFAULT))<0)
+ if((did = H5Dcreate2(fid, "dset_a", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
  /* create a dataset for the scale */
- if ((dsid=H5Dcreate(fid,"ds_a",H5T_NATIVE_INT,sidds,H5P_DEFAULT))<0)
+ if((dsid = H5Dcreate2(fid, "ds_a", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1755,7 +1750,7 @@ static int test_errors(void)
 
  TESTING2("attach a dataset to itself");
 
- if (H5DSattach_scale(did,did,0)==SUCCEED)
+ if(H5DSattach_scale(did, did, 0) == SUCCEED)
   goto out;
 
  PASSED();
@@ -1766,7 +1761,7 @@ static int test_errors(void)
  */
  TESTING2("attach a group with a dataset");
 
- if (H5DSattach_scale(gid,dsid,0)==SUCCEED)
+ if(H5DSattach_scale(gid,dsid,0)==SUCCEED)
   goto out;
 
  PASSED();
@@ -1777,7 +1772,7 @@ static int test_errors(void)
  */
  TESTING2("attach a dataset with a group");
 
- if (H5DSattach_scale(did,gid,0)==SUCCEED)
+ if(H5DSattach_scale(did,gid,0)==SUCCEED)
   goto out;
 
  PASSED();
@@ -1788,7 +1783,7 @@ static int test_errors(void)
  */
  TESTING2("set scale for a group");
 
- if (H5DSset_scale(gid,"scale 1")==SUCCEED)
+ if(H5DSset_scale(gid,"scale 1")==SUCCEED)
   goto out;
 
  PASSED();
@@ -1799,15 +1794,15 @@ static int test_errors(void)
  */
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
- if (H5Sclose(sidds)<0)
+ if(H5Sclose(sidds) < 0)
   goto out;
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
 
 
@@ -1819,35 +1814,35 @@ static int test_errors(void)
  TESTING2("attach a scale that has scales");
 
  /* create the data space for the scale */
- if ((sidds=H5Screate_simple(rankds,s1_dim,NULL))<0)
+ if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
   goto out;
 
  /* create a dataset "ds_b" for the scale */
- if ((dsid=H5Dcreate(fid,"ds_b",H5T_NATIVE_INT,sidds,H5P_DEFAULT))<0)
+ if((dsid = H5Dcreate2(fid, "ds_b", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the previous written "ds_a" */
- if ((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* attach "ds_b" to "ds_a", valid */
- if(H5DSattach_scale(did,dsid,0)<0)
+ if(H5DSattach_scale(did, dsid, 0) < 0)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Sclose(sidds)<0)
+ if(H5Sclose(sidds) < 0)
   goto out;
 
  /* open the previous written "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
   /* open the previous written "ds_a" */
- if ((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to attach "ds_a" to "dset_a", not valid */
@@ -1855,27 +1850,27 @@ static int test_errors(void)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  /* open the previous written "ds_a" */
- if ((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the previous written "ds_b" */
- if ((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
   goto out;
 
  /* detach "ds_b" to "ds_a" */
- if(H5DSdetach_scale(did,dsid,0)<0)
+ if(H5DSdetach_scale(did,dsid,0) < 0)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -1888,11 +1883,11 @@ static int test_errors(void)
  TESTING2("attach to a dataset that is a scale");
 
  /* open the previous written "ds_b", that is a scale */
- if ((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the previous written "ds_a" */
- if ((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to attach "ds_a" to "ds_b", not valid */
@@ -1900,9 +1895,9 @@ static int test_errors(void)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -1915,19 +1910,19 @@ static int test_errors(void)
  TESTING2("attach to a dataset that is a reserved class dataset");
 
  /* make an image */
- if (H5IMmake_image_8bit(fid,"image",(hsize_t)100,(hsize_t)50,NULL)<0)
+ if(H5IMmake_image_8bit(fid,"image",(hsize_t)100,(hsize_t)50,NULL) < 0)
   goto out;
 
  /* make a palette */
- if (H5IMmake_palette(fid,"pallete",pal_dims,NULL)<0)
+ if(H5IMmake_palette(fid,"pallete",pal_dims,NULL) < 0)
   goto out;
 
  /* open the previous written "ds_b" */
- if ((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the image dataset */
- if ((did = H5Dopen2(fid,"image", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"image", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to attach "ds_a" to the image, not valid */
@@ -1935,9 +1930,9 @@ static int test_errors(void)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -1950,27 +1945,27 @@ static int test_errors(void)
  TESTING2("is scale");
 
  /* open a non scale dataset */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* verify that it is not a dimension scale dataset  */
- if ((H5DSis_scale(did))==1)
+ if((H5DSis_scale(did))==1)
   goto out;
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  /* open the group. */
- if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+ if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
   goto out;
 
  /* verify that it is not a dimension scale dataset  */
- if ((H5DSis_scale(gid))==1)
+ if((H5DSis_scale(gid))==1)
   goto out;
 
  /* close */
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
 
  PASSED();
@@ -1984,11 +1979,11 @@ static int test_errors(void)
  TESTING2("detach scale from dataset it is not attached to");
 
  /* open the previous written "ds_a" */
- if ((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the previous written "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to detach "ds_a" from "dset_a" */
@@ -1996,9 +1991,9 @@ static int test_errors(void)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2012,11 +2007,11 @@ static int test_errors(void)
  TESTING2("detach scale from group");
 
  /* open the previous written "ds_a" */
- if ((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the group. */
- if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+ if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to detach "ds_a" from "grp" */
@@ -2024,9 +2019,9 @@ static int test_errors(void)
   goto out;
 
  /* close */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
 
  PASSED();
@@ -2040,11 +2035,11 @@ static int test_errors(void)
  TESTING2("detach scale when scale is group");
 
  /* open the previous written "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* open the group. */
- if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+ if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to detach "grp" from "dset_a" */
@@ -2052,16 +2047,16 @@ static int test_errors(void)
   goto out;
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
 
  PASSED();
 
 
  /* close */
- if (H5Fclose(fid)<0)
+ if(H5Fclose(fid) < 0)
   goto out;
 
  return 0;
@@ -2108,19 +2103,19 @@ static int test_iterators(void)
  */
 
  /* create a file using default properties */
- if ((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+ if((fid=H5Fcreate(FILE3,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
   goto out;
  /* create a group */
  if((gid = H5Gcreate2(fid, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
   /* close */
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_a",rank,dims,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"dset_a",rank,dims,NULL) < 0)
   goto out;
  /* make a DS dataset */
- if (H5LTmake_dataset_int(fid,"ds_a",rankds,s1_dim,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_a",rankds,s1_dim,NULL) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2131,15 +2126,15 @@ static int test_iterators(void)
  TESTING2("iterate when the dataset has no scales ");
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to iterate trough the 1st dimension of "dset_a", return error */
- if (H5DSiterate_scales(did,0,NULL,verify_scale,NULL)<0)
+ if(H5DSiterate_scales(did,0,NULL,verify_scale,NULL) < 0)
   goto out;
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2153,15 +2148,15 @@ static int test_iterators(void)
  TESTING2("iterate on dimension that is outside the rank ");
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to iterate trough the 3rd dimension of "dset_a", return error */
- if (H5DSiterate_scales(did,3,NULL,verify_scale,NULL)==SUCCEED)
+ if(H5DSiterate_scales(did,3,NULL,verify_scale,NULL)==SUCCEED)
   goto out;
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2174,32 +2169,32 @@ static int test_iterators(void)
  TESTING2("iterate for dimension with many scales ");
 
  /* open the previously written "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
- for (i=0; i<100; i++)
+ for(i=0; i<100; i++)
  {
   /* make a DS */
   sprintf(dname,"ds_%d",i);
-  if (H5LTmake_dataset_int(fid,dname,rankds,s1_dim,NULL)<0)
+  if(H5LTmake_dataset_int(fid,dname,rankds,s1_dim,NULL) < 0)
    goto out;
   /* open */
-  if ((dsid = H5Dopen2(fid,dname, H5P_DEFAULT))<0)
+  if((dsid = H5Dopen2(fid,dname, H5P_DEFAULT)) < 0)
    goto out;
   /* attach */
-  if(H5DSattach_scale(did,dsid,0)<0)
+  if(H5DSattach_scale(did,dsid,0) < 0)
    goto out;
   /* close */
-  if (H5Dclose(dsid)<0)
+  if(H5Dclose(dsid) < 0)
    goto out;
  }
 
  /* iterate trough the 1st dimension of "dset_a" */
- if (H5DSiterate_scales(did,0,NULL,op_bogus,NULL)<0)
+ if(H5DSiterate_scales(did,0,NULL,op_bogus,NULL) < 0)
   goto out;
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2212,15 +2207,15 @@ static int test_iterators(void)
  TESTING2("iterate on group ");
 
  /* open */
- if ((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+ if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
   goto out;
 
  /* try to iterate, return error */
- if (H5DSiterate_scales(gid,0,NULL,verify_scale,NULL)==SUCCEED)
+ if(H5DSiterate_scales(gid,0,NULL,verify_scale,NULL)==SUCCEED)
   goto out;
 
  /* close */
- if (H5Gclose(gid)<0)
+ if(H5Gclose(gid) < 0)
   goto out;
 
  PASSED();
@@ -2252,7 +2247,7 @@ static int test_iterators(void)
 
 
  /* close */
- if (H5Fclose(fid)<0)
+ if(H5Fclose(fid) < 0)
   goto out;
 
  return 0;
@@ -2299,23 +2294,23 @@ static int test_rank(void)
  */
 
  /* create a file using default properties */
- if ((fid=H5Fcreate(FILE4,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+ if((fid=H5Fcreate(FILE4,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
   goto out;
 
  /* make a dataset a 3D data dataset */
- if (H5LTmake_dataset_int(fid,"dset_a",3,dims3,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"dset_a",3,dims3,NULL) < 0)
   goto out;
 
  /* make a 1D scale dataset  */
- if (H5LTmake_dataset_int(fid,"ds_a_0",1,dims1,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_a_0",1,dims1,NULL) < 0)
   goto out;
 
  /* make a 2D scale dataset  */
- if (H5LTmake_dataset_int(fid,"ds_a_1",2,dims2,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_a_1",2,dims2,NULL) < 0)
   goto out;
 
  /* make a 3D scale dataset  */
- if (H5LTmake_dataset_int(fid,"ds_a_2",3,dims3,NULL)<0)
+ if(H5LTmake_dataset_int(fid,"ds_a_2",3,dims3,NULL) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2325,23 +2320,23 @@ static int test_rank(void)
 
  TESTING2("attach");
 
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
- for (i=0; i<3; i++)
+ for(i=0; i<3; i++)
  {
   sprintf(name,"ds_a_%d",i);
-  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT))<0)
+  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
    goto out;
-  if(H5DSattach_scale(did,dsid,(unsigned)i)<0)
+  if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
    goto out;
-  if (H5DSis_attached(did,dsid,(unsigned)i)<=0)
+  if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
    goto out;
-  if (H5Dclose(dsid)<0)
+  if(H5Dclose(dsid) < 0)
    goto out;
  }
 
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2354,22 +2349,22 @@ static int test_rank(void)
 
  TESTING2("detach");
 
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
- for (i=0; i<3; i++)
+ for(i=0; i<3; i++)
  {
   sprintf(name,"ds_a_%d",i);
-  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT))<0)
+  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
    goto out;
-  if(H5DSdetach_scale(did,dsid,(unsigned)i)<0)
+  if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
    goto out;
-  if (H5DSis_attached(did,dsid,(unsigned)i)!=0)
+  if(H5DSis_attached(did,dsid,(unsigned)i)!=0)
    goto out;
-  if (H5Dclose(dsid)<0)
+  if(H5Dclose(dsid) < 0)
    goto out;
  }
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2381,35 +2376,35 @@ static int test_rank(void)
 
  TESTING2("attach, set, get names, labels");
 
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
- for (i=0; i<3; i++)
+ for(i=0; i<3; i++)
  {
   sprintf(name,"ds_a_%d",i);
-  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT))<0)
+  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
    goto out;
-  if (H5DSset_scale(dsid,name)<0)
+  if(H5DSset_scale(dsid,name) < 0)
    goto out;
-  if(H5DSattach_scale(did,dsid,(unsigned)i)<0)
+  if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
    goto out;
-  if (H5DSis_attached(did,dsid,(unsigned)i)<=0)
+  if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
    goto out;
-  if (H5DSget_scale_name(dsid,names,sizeof(names))<0)
+  if(H5DSget_scale_name(dsid,names,sizeof(names)) < 0)
    goto out;
-  if (H5Dclose(dsid)<0)
+  if(H5Dclose(dsid) < 0)
    goto out;
-  if (H5DSset_label(did,(unsigned)i,name)<0)
+  if(H5DSset_label(did,(unsigned)i,name) < 0)
    goto out;
-  if (H5DSget_label(did,(unsigned)i,namel,sizeof(namel))<0)
+  if(H5DSget_label(did,(unsigned)i,namel,sizeof(namel)) < 0)
    goto out;
-  if (strcmp(name,names)!=0)
+  if(strcmp(name,names)!=0)
    goto out;
-  if (strcmp(name,namel)!=0)
+  if(strcmp(name,namel)!=0)
    goto out;
  }
 
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2422,35 +2417,35 @@ static int test_rank(void)
  TESTING2("attach a scalar scale");
 
  /* create the data space for the dataset */
- if ((sid=H5Screate_simple(2,dimss,NULL))<0)
+ if((sid = H5Screate_simple(2, dimss, NULL)) < 0)
   goto out;
  /* create a dataset of rank 2 */
- if ((did=H5Dcreate(fid,"dset_b",H5T_NATIVE_INT,sid,H5P_DEFAULT))<0)
+ if((did = H5Dcreate2(fid, "dset_b", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
  /* create a scalar space */
- if ((sidds = H5Screate(H5S_SCALAR))<0)
+ if((sidds = H5Screate(H5S_SCALAR)) < 0)
   goto out;
  /* create a dataset of scalar rank for the scale */
- if ((dsid=H5Dcreate(fid,"ds_b_1",H5T_NATIVE_FLOAT,sidds,H5P_DEFAULT))<0)
+ if((dsid = H5Dcreate2(fid, "ds_b_1", H5T_NATIVE_FLOAT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   goto out;
  /* write */
- if(H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,bufi)<0)
+ if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bufi) < 0)
   goto out;
- if(H5Dwrite(dsid,H5T_NATIVE_FLOAT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buff)<0)
+ if(H5Dwrite(dsid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buff) < 0)
   goto out;
  /* attach */
- if(H5DSattach_scale(did,dsid,0)<0)
+ if(H5DSattach_scale(did, dsid, 0) < 0)
   goto out;
- if(H5DSattach_scale(did,dsid,1)<0)
+ if(H5DSattach_scale(did, dsid, 1) < 0)
   goto out;
  /* close */
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
- if (H5Sclose(sidds)<0)
+ if(H5Sclose(sidds) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
 
  PASSED();
@@ -2459,7 +2454,7 @@ static int test_rank(void)
  * close
  *-------------------------------------------------------------------------
  */
- if (H5Fclose(fid)<0)
+ if(H5Fclose(fid) < 0)
   goto out;
 
  return 0;
@@ -2504,7 +2499,7 @@ static int test_types(void)
  *-------------------------------------------------------------------------
  */
  /* create a file using default properties */
- if ((fid=H5Fcreate(FILE5,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+ if((fid=H5Fcreate(FILE5,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2513,15 +2508,15 @@ static int test_types(void)
  */
 
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_a",rank,dims,buf)<0)
+ if(H5LTmake_dataset_int(fid,"dset_a",rank,dims,buf) < 0)
   goto out;
 
  /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_float(fid,DS_1_NAME,rankds,s1_dim,s1_float)<0)
+ if(H5LTmake_dataset_float(fid,DS_1_NAME,rankds,s1_dim,s1_float) < 0)
   goto out;
 
  /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset(fid,DS_2_NAME,rankds,s2_dim,H5T_NATIVE_USHORT,s2_ushort)<0)
+ if(H5LTmake_dataset(fid,DS_2_NAME,rankds,s2_dim,H5T_NATIVE_USHORT,s2_ushort) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2532,40 +2527,40 @@ static int test_types(void)
  TESTING2("floating point and short scales");
 
  /* get the dataset id for "dset_a" */
- if ((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
   goto out;
  /* attach the DS_1_NAME dimension scale to "dset_a" at dimension 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
  /* set name */
- if (H5DSset_scale(dsid,SCALE_1_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
   goto out;
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
   goto out;
  /* attach the DS_2_NAME dimension scale to "dset_a" at dimension 1 */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
  /* set name */
- if (H5DSset_scale(dsid,SCALE_2_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
   goto out;
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
  /* set a label */
- if (H5DSset_label(did,DIM0,DIM0_LABEL)<0)
+ if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
   goto out;
- if (H5DSset_label(did,DIM1,DIM1_LABEL)<0)
+ if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
   goto out;
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2576,15 +2571,15 @@ static int test_types(void)
  */
 
  /* make a dataset */
- if (H5LTmake_dataset_int(fid,"dset_b",rank,dims,buf)<0)
+ if(H5LTmake_dataset_int(fid,"dset_b",rank,dims,buf) < 0)
   goto out;
 
  /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_string(fid,"ds_b_1",s1_str)<0)
+ if(H5LTmake_dataset_string(fid,"ds_b_1",s1_str) < 0)
   goto out;
 
  /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset_string(fid,"ds_b_2",s2_str)<0)
+ if(H5LTmake_dataset_string(fid,"ds_b_2",s2_str) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2595,39 +2590,39 @@ static int test_types(void)
  TESTING2("string scales");
 
  /* get the dataset id for "dset_b" */
- if ((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
   goto out;
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT)) < 0)
   goto out;
  /* attach the DS_1_NAME dimension scale to "dset_b" at dimension 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
  /* set name */
- if (H5DSset_scale(dsid,SCALE_1_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
   goto out;
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"ds_b_2", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"ds_b_2", H5P_DEFAULT)) < 0)
   goto out;
  /* attach the DS_2_NAME dimension scale to "dset_b" at dimension 1 */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
  /* set name */
- if (H5DSset_scale(dsid,SCALE_2_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
   goto out;
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
  /* set a label */
- if (H5DSset_label(did,DIM0,DIM0_LABEL)<0)
+ if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
   goto out;
- if (H5DSset_label(did,DIM1,DIM1_LABEL)<0)
+ if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
   goto out;
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2636,7 +2631,7 @@ static int test_types(void)
  * close
  *-------------------------------------------------------------------------
  */
- if (H5Fclose(fid)<0)
+ if(H5Fclose(fid) < 0)
   goto out;
 
  return 0;
@@ -2680,7 +2675,7 @@ static int test_data(void)
  *-------------------------------------------------------------------------
  */
  /* create a file using default properties */
- if ((fid=H5Fcreate(FILE6,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT))<0)
+ if((fid=H5Fcreate(FILE6,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2689,15 +2684,15 @@ static int test_data(void)
  */
 
  /* read ASCII bathymetry data */
- if (read_data("dsdata.txt",2,dims,&vals)<0)
+ if(read_data("dsdata.txt",2,dims,&vals) < 0)
   goto out;
 
  /* read the latitude */
- if (read_data("dslat.txt",1,latdims,&latbuf)<0)
+ if(read_data("dslat.txt",1,latdims,&latbuf) < 0)
   goto out;
 
  /* read the longitude */
- if (read_data("dslon.txt",1,londims,&lonbuf)<0)
+ if(read_data("dslon.txt",1,londims,&lonbuf) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2713,29 +2708,29 @@ static int test_data(void)
  */
 
  /* make a DS dataset for the first dimension */
- if (H5LTmake_dataset_float(fid,"lat",1,latdims,latbuf)<0)
+ if(H5LTmake_dataset_float(fid, "lat", 1, latdims, latbuf) < 0)
   goto out;
 
  /* make a DS dataset for the second dimension */
- if (H5LTmake_dataset_float(fid,"lon",1,londims,lonbuf)<0)
+ if(H5LTmake_dataset_float(fid, "lon", 1, londims, lonbuf) < 0)
   goto out;
 
  /* make a dataset for the data. a fill value is set */
- if ((dcpl = H5Pcreate(H5P_DATASET_CREATE))<0)
+ if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
   goto out;
- if (H5Pset_fill_value(dcpl,H5T_NATIVE_FLOAT,&fill)<0)
+ if(H5Pset_fill_value(dcpl, H5T_NATIVE_FLOAT, &fill) < 0)
   goto out;
- if ((sid=H5Screate_simple(2,dims,NULL))<0)
+ if((sid = H5Screate_simple(2, dims, NULL)) < 0)
   goto out;
- if ((did=H5Dcreate(fid,"data",H5T_NATIVE_FLOAT,sid,dcpl))<0)
+ if((did = H5Dcreate2(fid, "data", H5T_NATIVE_FLOAT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
   goto out;
- if (H5Dwrite(did,H5T_NATIVE_FLOAT,H5S_ALL,H5S_ALL,H5P_DEFAULT,vals)<0)
+ if(H5Dwrite(did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, vals) < 0)
   goto out;
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
- if (H5Pclose(dcpl)<0)
+ if(H5Pclose(dcpl) < 0)
   goto out;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -2744,40 +2739,40 @@ static int test_data(void)
  */
 
  /* get the dataset id for "data" */
- if ((did = H5Dopen2(fid,"data", H5P_DEFAULT))<0)
+ if((did = H5Dopen2(fid,"data", H5P_DEFAULT)) < 0)
   goto out;
 
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"lat", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"lat", H5P_DEFAULT)) < 0)
   goto out;
  /* attach the DS_1_NAME dimension scale to "data" at dimension 0 */
- if (H5DSattach_scale(did,dsid,DIM0)<0)
+ if(H5DSattach_scale(did,dsid,DIM0) < 0)
   goto out;
  /* set name */
- if (H5DSset_scale(dsid,SCALE_1_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
   goto out;
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
  /* get the DS dataset id */
- if ((dsid = H5Dopen2(fid,"lon", H5P_DEFAULT))<0)
+ if((dsid = H5Dopen2(fid,"lon", H5P_DEFAULT)) < 0)
   goto out;
  /* attach the DS_2_NAME dimension scale to "data" at dimension 1 */
- if (H5DSattach_scale(did,dsid,DIM1)<0)
+ if(H5DSattach_scale(did,dsid,DIM1) < 0)
   goto out;
  /* set name */
- if (H5DSset_scale(dsid,SCALE_2_NAME)<0)
+ if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
   goto out;
  /* close DS id */
- if (H5Dclose(dsid)<0)
+ if(H5Dclose(dsid) < 0)
   goto out;
  /* set a label */
- if (H5DSset_label(did,DIM0,DIM0_LABEL)<0)
+ if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
   goto out;
- if (H5DSset_label(did,DIM1,DIM1_LABEL)<0)
+ if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
   goto out;
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  PASSED();
@@ -2788,7 +2783,7 @@ static int test_data(void)
  * close
  *-------------------------------------------------------------------------
  */
- if (H5Fclose(fid)<0)
+ if(H5Fclose(fid) < 0)
   goto out;
 
  return 0;
@@ -2832,7 +2827,7 @@ static int read_data( const char* fname, int ndims, hsize_t *dims, float **buf )
 
  strcpy(data_file, "");
  /* compose the name of the file to open, using the srcdir, if appropriate */
- if (srcdir)
+ if(srcdir)
  {
   strcpy(data_file, srcdir);
   strcat(data_file, "/");
@@ -2841,13 +2836,13 @@ static int read_data( const char* fname, int ndims, hsize_t *dims, float **buf )
  strcat(data_file,fname);
 
  f = fopen(data_file, "r");
- if ( f == NULL )
+ if( f == NULL )
  {
   printf( "Could not open file %s\n", data_file );
   return -1;
  }
 
- for (i=0, nelms=1; i < ndims; i++)
+ for(i=0, nelms=1; i < ndims; i++)
  {
   fscanf( f, "%s %u", str, &j);
   fscanf( f, "%d",&n );
@@ -2857,7 +2852,7 @@ static int read_data( const char* fname, int ndims, hsize_t *dims, float **buf )
 
  *buf = (float*) malloc (nelms * sizeof( float ));
 
- for (j = 0; j < nelms; j++)
+ for(j = 0; j < nelms; j++)
  {
   fscanf( f, "%f",&val );
   (*buf)[j] = val;