[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

7 files changed, 794 insertions, 995 deletions

diff --git a/hl/examples/ex_lite3.c b/hl/examples/ex_lite3.c
index f15820d..9164c7b 100644
--- a/hl/examples/ex_lite3.c
+++ b/hl/examples/ex_lite3.c
@@ -30,13 +30,13 @@ int main( void )
  int     i;
 
  /* create a file */
- file_id = H5Fcreate ("ex_lite3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ file_id = H5Fcreate("ex_lite3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
  /* create a data space  */
- space_id = H5Screate_simple(1,dims,NULL);
+ space_id = H5Screate_simple(1, dims, NULL);
 
  /* create a dataset named "dset" */
- dset_id = H5Dcreate(file_id,"dset",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
+ dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
  /* close */
  status = H5Dclose(dset_id);
@@ -48,7 +48,7 @@ int main( void )
  */
 
  /* create and write the attribute "attr1" on the dataset "dset" */
- status = H5LTset_attribute_int(file_id,"dset","attr1",data,ATTR_SIZE);
+ status = H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
 
 /*-------------------------------------------------------------------------
  * example of H5LTget_attribute_int
@@ -56,18 +56,15 @@ int main( void )
  */
 
  /* get the attribute "attr1" from the dataset "dset" */
- status = H5LTget_attribute_int(file_id,"dset","attr1",data);
+ status = H5LTget_attribute_int(file_id, "dset", "attr1", data);
 
- for (i=0; i< ATTR_SIZE; i++ )
- {
-  printf ("  %d", data[i]);
- }
- printf ("\n");
+ for(i = 0; i < ATTR_SIZE; i++ )
+  printf("  %d", data[i]);
+ printf("\n");
 
  /* close file */
  status = H5Fclose(file_id);
 
  return 0;
-
 }
 
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index 0b0f75a..651c60b 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -23,7 +23,7 @@
  * private functions
  *-------------------------------------------------------------------------
  */
-herr_t H5IM_get_palette( hid_t loc_id,
+herr_t H5IM_get_palette(hid_t loc_id,
                          const char *image_name,
                          int pal_number,
                          hid_t tid,
@@ -50,11 +50,11 @@ herr_t H5IM_get_palette( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_image_8bitf( hid_t loc_id,
+herr_t H5IMmake_image_8bitf(hid_t loc_id,
                              const char *dset_name,
                              hsize_t width,
                              hsize_t height,
-                             int_f *buf )
+                             int_f *buf)
 {
  hid_t    did;                  /* dataset ID */
  hid_t    sid;                  /* space ID */
@@ -71,35 +71,34 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id,
  */
 
  /* create the data space for the dataset. */
- if ((sid=H5Screate_simple(IMAGE8_RANK,dims,NULL))<0)
+ if((sid = H5Screate_simple(IMAGE8_RANK, dims, NULL)) < 0)
   return -1;
 
  /* create the dataset as H5T_NATIVE_UCHAR */
- if ((did=H5Dcreate(loc_id,dset_name,H5T_NATIVE_UINT8,sid,H5P_DEFAULT))<0)
+ if((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UINT8, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   return -1;
 
  /* write with memory type H5T_NATIVE_INT */
  /* Use long type if Fortran integer is 8 bytes and C long long is also 8 bytes*/
  /* Fail if otherwise */
- if (buf)
- {
-  if (sizeof(int_f) == sizeof(int)) {
-  if (H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
-   return -1;}
-  else if (sizeof(int_f) == sizeof(long)) {
-  if (H5Dwrite(did,H5T_NATIVE_LONG,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
-   return -1;}
-  else if (sizeof(int_f) == sizeof(long_long)) {
-  if (H5Dwrite(did,H5T_NATIVE_LLONG,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
-   return -1;}
-  else
-   return -1;
+ if(buf) {
+  if(sizeof(int_f) == sizeof(int)) {
+      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+       return -1;
+  } else if(sizeof(int_f) == sizeof(long)) {
+      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+       return -1;
+  } else if(sizeof(int_f) == sizeof(long_long)) {
+      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+       return -1;
+  } else
+       return -1;
  }
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   return -1;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   return -1;
 
 /*-------------------------------------------------------------------------
@@ -108,15 +107,15 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id,
  */
 
  /* attach the CLASS attribute */
- if ( H5LTset_attribute_string( loc_id, dset_name, "CLASS", IMAGE_CLASS ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
   return -1;
 
  /* attach the VERSION attribute */
- if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
   return -1;
 
  /* attach the IMAGE_SUBCLASS attribute */
- if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED" ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_INDEXED") < 0)
   return -1;
 
  return 0;
@@ -150,7 +149,7 @@ herr_t H5IMmake_image_8bitf( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_image_24bitf( hid_t loc_id,
+herr_t H5IMmake_image_24bitf(hid_t loc_id,
                               const char *dset_name,
                               hsize_t width,
                               hsize_t height,
@@ -165,22 +164,21 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id,
  * attach the image dimensions according to the interlace mode
  *-------------------------------------------------------------------------
  */
- if ( strcmp( interlace, "INTERLACE_PIXEL" ) == 0 )
- {
+ if(strcmp(interlace, "INTERLACE_PIXEL") == 0) {
   /* Number of color planes is defined as the third dimension */
   dims[0] = height;
   dims[1] = width;
   dims[2] = IMAGE24_RANK;
  }
  else
- if ( strcmp( interlace, "INTERLACE_PLANE" ) == 0 )
- {
+ if(strcmp(interlace, "INTERLACE_PLANE") == 0) {
   /* Number of color planes is defined as the first dimension */
   dims[0] = IMAGE24_RANK;
   dims[1] = height;
   dims[2] = width;
  }
- else return -1;
+ else
+  return -1;
 
 /*-------------------------------------------------------------------------
  * create and write the dataset
@@ -188,33 +186,32 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id,
  */
 
  /* create the data space for the dataset. */
- if ((sid=H5Screate_simple(IMAGE24_RANK,dims,NULL))<0)
+ if((sid = H5Screate_simple(IMAGE24_RANK, dims, NULL)) < 0)
   return -1;
 
  /* create the dataset as H5T_NATIVE_UCHAR */
- if ((did=H5Dcreate(loc_id,dset_name,H5T_NATIVE_UCHAR,sid,H5P_DEFAULT))<0)
+ if((did = H5Dcreate2(loc_id, dset_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   return -1;
 
  /* write with memory type H5T_NATIVE_INT */
- if (buf)
- {
-  if (sizeof(int_f) == sizeof(int)) {
-  if (H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
-   return -1;}
-  else if (sizeof(int_f) == sizeof(long)) {
-  if (H5Dwrite(did,H5T_NATIVE_LONG,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
-   return -1;}
-  else if (sizeof(int_f) == sizeof(long_long)) {
-  if (H5Dwrite(did,H5T_NATIVE_LLONG,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf)<0)
-   return -1;}
-  else
+ if(buf) {
+  if(sizeof(int_f) == sizeof(int)) {
+      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+       return -1;
+  } else if(sizeof(int_f) == sizeof(long)) {
+      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+       return -1;
+  } else if(sizeof(int_f) == sizeof(long_long)) {
+      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+       return -1;
+  } else
    return -1;
  }
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   return -1;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   return -1;
 
 /*-------------------------------------------------------------------------
@@ -223,19 +220,19 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id,
  */
 
  /* Attach the CLASS attribute */
- if ( H5LTset_attribute_string( loc_id, dset_name, "CLASS", IMAGE_CLASS ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "CLASS", IMAGE_CLASS) < 0)
   return -1;
 
  /* Attach the VERSION attribute */
- if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_VERSION", IMAGE_VERSION) < 0)
   return -1;
 
  /* Attach the IMAGE_SUBCLASS attribute */
- if ( H5LTset_attribute_string( loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR" ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "IMAGE_SUBCLASS", "IMAGE_TRUECOLOR") < 0)
   return -1;
 
  /* Attach the INTERLACE_MODE attribute. This attributes is only for true color images */
- if ( H5LTset_attribute_string( loc_id, dset_name, "INTERLACE_MODE", interlace ) < 0 )
+ if(H5LTset_attribute_string(loc_id, dset_name, "INTERLACE_MODE", interlace) < 0)
   return -1;
 
  return 0;
@@ -264,9 +261,9 @@ herr_t H5IMmake_image_24bitf( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMread_imagef( hid_t loc_id,
+herr_t H5IMread_imagef(hid_t loc_id,
                         const char *dset_name,
-                        int_f *buf )
+                        int_f *buf)
 {
     hid_t   did;
     hid_t   tid;
@@ -325,10 +322,10 @@ out:
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMmake_palettef( hid_t loc_id,
+herr_t H5IMmake_palettef(hid_t loc_id,
                           const char *pal_name,
                           const hsize_t *pal_dims,
-                          int_f *pal_data )
+                          int_f *pal_data)
 
 {
 
@@ -337,10 +334,10 @@ herr_t H5IMmake_palettef( hid_t loc_id,
  int   has_pal;
 
  /* Check if the dataset already exists */
- has_pal = H5LTfind_dataset( loc_id, pal_name );
+ has_pal = H5LTfind_dataset(loc_id, pal_name);
 
  /* It exists. Return */
- if ( has_pal == 1 )
+ if(has_pal == 1)
   return 0;
 
 /*-------------------------------------------------------------------------
@@ -349,33 +346,32 @@ herr_t H5IMmake_palettef( hid_t loc_id,
  */
 
  /* create the data space for the dataset. */
- if ((sid=H5Screate_simple(2,pal_dims,NULL))<0)
+ if((sid = H5Screate_simple(2, pal_dims, NULL)) < 0)
   return -1;
 
  /* create the dataset as H5T_NATIVE_UCHAR */
- if ((did=H5Dcreate(loc_id,pal_name,H5T_NATIVE_UCHAR,sid,H5P_DEFAULT))<0)
+ if((did = H5Dcreate2(loc_id, pal_name, H5T_NATIVE_UCHAR, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
   return -1;
 
  /* write with memory type H5T_NATIVE_INT */
- if (pal_data)
- {
-  if (sizeof(int_f) == sizeof(int)) {
-  if (H5Dwrite(did,H5T_NATIVE_INT,H5S_ALL,H5S_ALL,H5P_DEFAULT,pal_data)<0)
-   return -1;}
-  else if (sizeof(int_f) == sizeof(long)) {
-  if (H5Dwrite(did,H5T_NATIVE_LONG,H5S_ALL,H5S_ALL,H5P_DEFAULT,pal_data)<0)
-   return -1;}
-  else if (sizeof(int_f) == sizeof(long_long)) {
-  if (H5Dwrite(did,H5T_NATIVE_LLONG,H5S_ALL,H5S_ALL,H5P_DEFAULT,pal_data)<0)
-   return -1;}
-  else
-   return -1;
+ if(pal_data) {
+  if(sizeof(int_f) == sizeof(int)) {
+      if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+       return -1;
+  } else if(sizeof(int_f) == sizeof(long)) {
+      if(H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+       return -1;
+  } else if(sizeof(int_f) == sizeof(long_long)) {
+      if(H5Dwrite(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
+       return -1;
+  } else
+      return -1;
  }
 
  /* close */
- if (H5Dclose(did)<0)
+ if(H5Dclose(did) < 0)
   return -1;
- if (H5Sclose(sid)<0)
+ if(H5Sclose(sid) < 0)
   return -1;
 
 /*-------------------------------------------------------------------------
@@ -384,11 +380,11 @@ herr_t H5IMmake_palettef( hid_t loc_id,
  */
 
  /* Attach the attribute "CLASS" to the >>palette<< dataset*/
- if ( H5LTset_attribute_string( loc_id, pal_name, "CLASS", PALETTE_CLASS ) < 0 )
+ if(H5LTset_attribute_string(loc_id, pal_name, "CLASS", PALETTE_CLASS) < 0)
   return -1;
 
  /* Attach the attribute "PAL_VERSION" to the >>palette<< dataset*/
- if ( H5LTset_attribute_string( loc_id, pal_name, "PAL_VERSION", "1.2" ) < 0 )
+ if(H5LTset_attribute_string(loc_id, pal_name, "PAL_VERSION", "1.2") < 0)
   return -1;
 
  return 0;
@@ -420,16 +416,16 @@ herr_t H5IMmake_palettef( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
-herr_t H5IMget_palettef( hid_t loc_id,
+herr_t H5IMget_palettef(hid_t loc_id,
                          const char *image_name,
                          int pal_number,
-                         int_f *pal_data )
+                         int_f *pal_data)
 {
  if(sizeof(int_f) == sizeof(int))
   return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_INT,pal_data);
- else if (sizeof(int_f) == sizeof(long))
+ else if(sizeof(int_f) == sizeof(long))
   return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LONG,pal_data);
- else if (sizeof(int_f) == sizeof(long_long))
+ else if(sizeof(int_f) == sizeof(long_long))
   return H5IM_get_palette(loc_id,image_name,pal_number,H5T_NATIVE_LLONG,pal_data);
  else
   return -1;
@@ -462,7 +458,7 @@ herr_t H5IMget_palettef( hid_t loc_id,
  *
  *-------------------------------------------------------------------------
  */
-herr_t H5IM_get_palette( hid_t loc_id,
+herr_t H5IM_get_palette(hid_t loc_id,
                          const char *image_name,
                          int pal_number,
                          hid_t tid,
@@ -486,7 +482,7 @@ herr_t H5IM_get_palette( hid_t loc_id,
  /* Try to find the attribute "PALETTE" on the >>image<< dataset */
  has_pal = H5IM_find_palette(image_id);
 
- if(has_pal ==  1 )
+ if(has_pal ==  1)
  {
 
   if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -495,62 +491,62 @@ herr_t H5IM_get_palette( hid_t loc_id,
   if((attr_type = H5Aget_type(attr_id)) < 0)
    goto out;
 
-  if ( (attr_class = H5Tget_class( attr_type )) < 0 )
+  if((attr_class = H5Tget_class(attr_type)) < 0)
    goto out;
 
   /* Check if it is really a reference */
-  if ( attr_class == H5T_REFERENCE )
+  if(attr_class == H5T_REFERENCE)
   {
 
    /* Get the reference(s) */
-   if ( (attr_space_id = H5Aget_space( attr_id )) < 0 )
+   if((attr_space_id = H5Aget_space(attr_id)) < 0)
     goto out;
 
-   n_refs = H5Sget_simple_extent_npoints( attr_space_id );
+   n_refs = H5Sget_simple_extent_npoints(attr_space_id);
 
    dim_ref = n_refs;
 
-   refbuf = malloc( sizeof(hobj_ref_t) * (int)dim_ref );
+   refbuf = malloc(sizeof(hobj_ref_t) * (int)dim_ref);
 
-   if ( H5Aread( attr_id, attr_type, refbuf ) < 0 )
+   if(H5Aread(attr_id, attr_type, refbuf) < 0)
     goto out;
 
    /* Get the palette id */
-   if ( (pal_id = H5Rdereference( image_id, H5R_OBJECT, &refbuf[pal_number] )) < 0 )
+   if((pal_id = H5Rdereference(image_id, H5R_OBJECT, &refbuf[pal_number])) < 0)
     goto out;
 
    /* Read the palette dataset using the memory type TID */
-   if ( H5Dread( pal_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data ) < 0 )
+   if(H5Dread(pal_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, pal_data) < 0)
     goto out;
 
-   if ( H5Sclose( attr_space_id ) < 0 )
+   if(H5Sclose(attr_space_id) < 0)
     goto out;
 
    /* close the dereferenced dataset */
-   if (H5Dclose(pal_id)<0)
+   if(H5Dclose(pal_id) < 0)
     goto out;
 
-   free( refbuf );
+   free(refbuf);
 
   } /* H5T_REFERENCE */
 
-  if ( H5Tclose( attr_type ) < 0 )
+  if(H5Tclose(attr_type) < 0)
    goto out;
 
   /* Close the attribute. */
-  if ( H5Aclose( attr_id ) < 0 )
+  if(H5Aclose(attr_id) < 0)
    goto out;
 
  }
 
  /* Close the image dataset. */
- if ( H5Dclose( image_id ) < 0 )
+ if(H5Dclose(image_id) < 0)
   return -1;
 
  return 0;
 
 out:
- H5Dclose( image_id );
+ H5Dclose(image_id);
  return -1;
 
 
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index a98d567..e226f89 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -45,6 +45,61 @@ static herr_t H5LT_get_attribute_mem(hid_t loc_id,
                            void *data);
 
 /*-------------------------------------------------------------------------
+ * Function: H5LT_make_dataset
+ *
+ * Purpose: Creates and writes a dataset of a type tid
+ *
+ * Return: Success: 0, Failure: -1
+ *
+ * Programmer: Quincey Koziol, koziol@hdfgroup.org
+ *
+ * Date: October 10, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+
+static herr_t
+H5LT_make_dataset_numerical( hid_t loc_id,
+                         const char *dset_name,
+                         int rank,
+                         const hsize_t *dims,
+                         hid_t tid,
+                         const void *data )
+{
+    hid_t   did = -1, sid = -1;
+
+    /* Create the data space for the dataset. */
+    if((sid = H5Screate_simple(rank, dims, NULL)) < 0)
+        return -1;
+
+    /* Create the dataset. */
+    if((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* Write the dataset only if there is data to write */
+    if(data)
+        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0)
+            goto out;
+
+    /* End access to the dataset and release resources used by it. */
+    if(H5Dclose(did) < 0)
+        return -1;
+
+    /* Terminate access to the data space. */
+    if(H5Sclose(sid) < 0)
+        return -1;
+
+    return 0;
+
+out:
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
+}
+
+/*-------------------------------------------------------------------------
  *
  * Public functions
  *
@@ -77,39 +132,7 @@ herr_t H5LTmake_dataset( hid_t loc_id,
                          hid_t tid,
                          const void *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, tid, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, tid, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -137,39 +160,7 @@ herr_t H5LTmake_dataset_char( hid_t loc_id,
                               const hsize_t *dims,
                               const char *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, H5T_NATIVE_CHAR, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_CHAR, data));
 }
 
 
@@ -199,39 +190,7 @@ herr_t H5LTmake_dataset_short( hid_t loc_id,
                                const hsize_t *dims,
                                const short *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, H5T_NATIVE_SHORT, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_SHORT, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -260,39 +219,7 @@ herr_t H5LTmake_dataset_int( hid_t loc_id,
                              const hsize_t *dims,
                              const int *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, H5T_NATIVE_INT, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_INT, data));
 }
 
 
@@ -323,39 +250,7 @@ herr_t H5LTmake_dataset_long( hid_t loc_id,
                               const hsize_t *dims,
                               const long *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, H5T_NATIVE_LONG, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_LONG, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -384,39 +279,7 @@ herr_t H5LTmake_dataset_float( hid_t loc_id,
                                const hsize_t *dims,
                                const float *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, H5T_NATIVE_FLOAT, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_FLOAT, data));
 }
 
 
@@ -447,39 +310,7 @@ herr_t H5LTmake_dataset_double( hid_t loc_id,
                                 const hsize_t *dims,
                                 const double *data )
 {
-
- hid_t   did, sid;
-
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate_simple( rank, dims, NULL )) < 0 )
-  return -1;
-
- /* Create the dataset. */
- if ( (did = H5Dcreate( loc_id, dset_name, H5T_NATIVE_DOUBLE, sid, H5P_DEFAULT )) < 0 )
-  goto out;
-
- /* Write the dataset only if there is data to write */
-
- if ( data )
- {
-  if ( H5Dwrite( did, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0 )
-   goto out;
- }
-
- /* End access to the dataset and release resources used by it. */
- if ( H5Dclose( did ) < 0 )
-  return -1;
-
- /* Terminate access to the data space. */
- if ( H5Sclose( sid ) < 0 )
-  return -1;
-
- return 0;
-
-out:
- H5Dclose( did );
- H5Sclose( sid );
- return -1;
+    return(H5LT_make_dataset_numerical(loc_id, dset_name, rank, dims, H5T_NATIVE_DOUBLE, data));
 }
 
 
@@ -507,55 +338,53 @@ herr_t H5LTmake_dataset_string(hid_t loc_id,
                                const char *dset_name,
                                const char *buf )
 {
+    hid_t   did = -1;
+    hid_t   sid = -1;
+    hid_t   tid = -1;
+    size_t  size;
 
- hid_t   did=-1;
- hid_t   sid=-1;
- hid_t   tid;
- size_t  size;
-
- /* create a string data type */
- if ( (tid = H5Tcopy( H5T_C_S1 )) < 0 )
-  goto out;
-
- size = strlen(buf) + 1; /* extra null term */
+    /* create a string data type */
+    if((tid = H5Tcopy(H5T_C_S1)) < 0 )
+        goto out;
 
- if ( H5Tset_size(tid,size) < 0 )
-  goto out;
+    size = strlen(buf) + 1; /* extra null term */
 
- if ( H5Tset_strpad(tid,H5T_STR_NULLTERM ) < 0 )
-  goto out;
+    if(H5Tset_size(tid, size) < 0)
+        goto out;
 
- /* Create the data space for the dataset. */
- if ( (sid = H5Screate( H5S_SCALAR )) < 0 )
-  goto out;
+    if(H5Tset_strpad(tid, H5T_STR_NULLTERM) < 0)
+        goto out;
 
- /* Create the dataset. */
- if ( (did = H5Dcreate(loc_id,dset_name,tid,sid,H5P_DEFAULT)) < 0 )
-  goto out;
+    /* Create the data space for the dataset. */
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
+        goto out;
 
- /* Write the dataset only if there is data to write */
+    /* Create the dataset. */
+    if((did = H5Dcreate2(loc_id, dset_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
 
- if (buf)
- {
-  if ( H5Dwrite(did,tid,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf) < 0 )
-   goto out;
- }
+    /* Write the dataset only if there is data to write */
+    if(buf)
+        if(H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0)
+            goto out;
 
- /* close*/
- if ( H5Dclose(did) < 0 )
-  return -1;
- if ( H5Sclose(sid) < 0 )
-  return -1;
- if ( H5Tclose(tid) < 0 )
-  goto out;
+    /* close*/
+    if(H5Dclose(did) < 0)
+        return -1;
+    if(H5Sclose(sid) < 0)
+        return -1;
+    if(H5Tclose(tid) < 0)
+        goto out;
 
- return 0;
+    return 0;
 
 out:
-  H5Dclose(did);
-  H5Tclose(tid);
-  H5Sclose(sid);
- return -1;
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Tclose(tid);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return -1;
 }
 
 
@@ -574,7 +403,7 @@ out:
  */
 
 static herr_t
-H5LT_read_dataset(hid_t loc_id, const char *dset_name, hid_t tid, void *data)
+H5LT_read_dataset_numerical(hid_t loc_id, const char *dset_name, hid_t tid, void *data)
 {
     hid_t   did;
 
@@ -616,7 +445,7 @@ herr_t H5LTread_dataset(hid_t loc_id,
                         hid_t tid,
                         void *data)
 {
-    return(H5LT_read_dataset(loc_id, dset_name, tid, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, tid, data));
 }
 
 
@@ -638,7 +467,7 @@ herr_t H5LTread_dataset_char( hid_t loc_id,
                               const char *dset_name,
                               char *data )
 {
-    return(H5LTread_dataset(loc_id, dset_name, H5T_NATIVE_CHAR, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_CHAR, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -659,7 +488,7 @@ herr_t H5LTread_dataset_short( hid_t loc_id,
                                const char *dset_name,
                                short *data )
 {
-    return(H5LTread_dataset(loc_id, dset_name, H5T_NATIVE_SHORT, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_SHORT, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -680,7 +509,7 @@ herr_t H5LTread_dataset_int( hid_t loc_id,
                              const char *dset_name,
                              int *data )
 {
-    return(H5LTread_dataset(loc_id, dset_name, H5T_NATIVE_INT, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_INT, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -701,7 +530,7 @@ herr_t H5LTread_dataset_long( hid_t loc_id,
                               const char *dset_name,
                               long *data )
 {
-    return(H5LTread_dataset(loc_id, dset_name, H5T_NATIVE_LONG, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_LONG, data));
 }
 
 /*-------------------------------------------------------------------------
@@ -722,7 +551,7 @@ herr_t H5LTread_dataset_float( hid_t loc_id,
                                const char *dset_name,
                                float *data )
 {
-    return(H5LTread_dataset(loc_id, dset_name, H5T_NATIVE_FLOAT, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_FLOAT, data));
 }
 
 
@@ -744,7 +573,7 @@ herr_t H5LTread_dataset_double( hid_t loc_id,
                                 const char *dset_name,
                                 double *data )
 {
-    return(H5LTread_dataset(loc_id, dset_name, H5T_NATIVE_DOUBLE, data));
+    return(H5LT_read_dataset_numerical(loc_id, dset_name, H5T_NATIVE_DOUBLE, data));
 }
 
 
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index aedc7b5..f337360 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -83,8 +83,8 @@ hid_t H5PTcreate_fl ( hid_t loc_id,
   hid_t ret_value;
 
   /* Register the packet table ID type if this is the first table created */
-  if( H5PT_ptable_id_type < 0)
-    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)free)) <0)
+  if(H5PT_ptable_id_type < 0)
+    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)free)) < 0)
       goto out;
 
   /* Get memory for the table identifier */
@@ -94,35 +94,33 @@ hid_t H5PTcreate_fl ( hid_t loc_id,
   dims[0] = 0;
   dims_chunk[0] = chunk_size;
   maxdims[0] = H5S_UNLIMITED;
-  if ( (space_id = H5Screate_simple( 1, dims, maxdims )) < 0 )
+  if((space_id = H5Screate_simple(1, dims, maxdims)) < 0)
     goto out;
 
   /* Modify dataset creation properties to enable chunking  */
-  plist_id = H5Pcreate (H5P_DATASET_CREATE);
-  if ( H5Pset_chunk ( plist_id, 1, dims_chunk ) < 0 )
+  plist_id = H5Pcreate(H5P_DATASET_CREATE);
+  if(H5Pset_chunk(plist_id, 1, dims_chunk) < 0)
     goto out;
   if(compression >= 0 && compression <= 9)
-  {
-    if( H5Pset_deflate(plist_id, (unsigned)compression) < 0)
+    if(H5Pset_deflate(plist_id, (unsigned)compression) < 0)
         goto out;
-  }
 
   /* Create the dataset. */
-  if ( (dset_id=H5Dcreate( loc_id, dset_name, dtype_id, space_id, plist_id))<0 )
+  if((dset_id = H5Dcreate2(loc_id, dset_name, dtype_id, space_id, H5P_DEFAULT, plist_id, H5P_DEFAULT)) < 0)
     goto out;
 
   /* Terminate access to the data space. */
-  if ( H5Sclose( space_id ) < 0 )
+  if(H5Sclose(space_id) < 0)
     goto out;
 
   /* End access to the property list */
-  if ( H5Pclose( plist_id ) < 0 )
+  if(H5Pclose(plist_id) < 0)
     goto out;
 
   /* Create the table identifier */
   table->dset_id = dset_id;
 
-  if((table->type_id = H5Tcopy(dtype_id)) <0)
+  if((table->type_id = H5Tcopy(dtype_id)) < 0)
     goto out;
 
   H5PT_create_index(table);
@@ -131,7 +129,7 @@ hid_t H5PTcreate_fl ( hid_t loc_id,
   /* Get an ID for this table */
   ret_value = H5Iregister(H5PT_ptable_id_type, table);
 
-  if (ret_value != H5I_INVALID_HID)
+  if(ret_value != H5I_INVALID_HID)
     H5PT_ptable_count++;
   else
     H5PT_close(table);
@@ -180,14 +178,14 @@ hid_t H5PTcreate_vl ( hid_t loc_id,
 
   /* Create a variable length type that uses single bytes as its base type */
   vltype = H5Tvlen_create(H5T_NATIVE_UCHAR);
-  if (vltype < 0)
+  if(vltype < 0)
     goto out;
 
-  if((ret_value=H5PTcreate_fl(loc_id, dset_name, vltype, chunk_size, 0)) <0)
+  if((ret_value=H5PTcreate_fl(loc_id, dset_name, vltype, chunk_size, 0)) < 0)
     goto out;
 
   /* close the vltype */
-  if (H5Tclose(vltype) < 0)
+  if(H5Tclose(vltype) < 0)
     goto out;
 
   return ret_value;
@@ -229,7 +227,7 @@ hid_t H5PTopen( hid_t loc_id,
 
   /* Register the packet table ID type if this is the first table created */
   if( H5PT_ptable_id_type < 0)
-    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)free))<0)
+    if((H5PT_ptable_id_type = H5Iregister_type((size_t)H5PT_HASH_TABLE_SIZE, 0, (H5I_free_t)free)) < 0)
       goto out;
 
   table = (htbl_t *)malloc(sizeof(htbl_t));
@@ -237,35 +235,35 @@ hid_t H5PTopen( hid_t loc_id,
   /* Open the dataset */
   if((table->dset_id = H5Dopen2(loc_id, dset_name, H5P_DEFAULT)) < 0)
       goto out;
-  if (table->dset_id < 0)
+  if(table->dset_id < 0)
     goto out;
 
   /* Get the dataset's disk datatype */
-  if ((type_id = H5Dget_type(table->dset_id)) < 0)
+  if((type_id = H5Dget_type(table->dset_id)) < 0)
     goto out;
 
   /* Get the table's native datatype */
-  if ((table->type_id = H5Tget_native_type(type_id, H5T_DIR_ASCEND)) < 0)
+  if((table->type_id = H5Tget_native_type(type_id, H5T_DIR_ASCEND)) < 0)
     goto out;
 
-  if (H5Tclose(type_id) < 0)
+  if(H5Tclose(type_id) < 0)
     goto out;
 
   /* Initialize the current record pointer */
-  if((H5PT_create_index(table)) <0)
+  if((H5PT_create_index(table)) < 0)
     goto out;
 
   /* Get number of records in table */
-  if((space_id=H5Dget_space(table->dset_id)) <0)
+  if((space_id=H5Dget_space(table->dset_id)) < 0)
     goto out;
-  if ( H5Sget_simple_extent_dims( space_id, dims, NULL) < 0 )
+  if( H5Sget_simple_extent_dims( space_id, dims, NULL) < 0)
     goto out;
   table->size = dims[0];
 
   /* Get an ID for this table */
   ret_value = H5Iregister(H5PT_ptable_id_type, table);
 
-  if (ret_value != H5I_INVALID_HID)
+  if(ret_value != H5I_INVALID_HID)
     H5PT_ptable_count++;
   else
     H5PT_close(table);
@@ -311,11 +309,11 @@ herr_t H5PT_close( htbl_t* table)
     goto out;
 
   /* Close the dataset */
-  if (H5Dclose(table->dset_id) < 0)
+  if(H5Dclose(table->dset_id) < 0)
     goto out;
 
   /* Close the memory datatype */
-  if (H5Tclose(table->type_id) < 0)
+  if(H5Tclose(table->type_id) < 0)
     goto out;
 
   free(table);
@@ -370,7 +368,7 @@ herr_t H5PTclose( hid_t table_id )
 
   /* Remove the packet table type ID if no more packet */
   /* tables are open                                   */
-  if (H5PT_ptable_count == 0)
+  if(H5PT_ptable_count == 0)
   {
     H5Idestroy_type(H5PT_ptable_id_type);
     H5PT_ptable_id_type = H5I_UNINIT;
@@ -419,11 +417,11 @@ herr_t H5PTappend( hid_t table_id,
     goto out;
 
   /* If we are asked to write 0 records, just do nothing */
-  if (nrecords == 0)
+  if(nrecords == 0)
     return 0;
 
   if((H5TB_common_append_records(table->dset_id, table->type_id,
-  			nrecords, table->size, data)) <0)
+  			nrecords, table->size, data)) < 0)
     goto out;
 
   /* Update table size */
@@ -473,7 +471,7 @@ herr_t H5PTget_next( hid_t table_id,
     goto out;
 
   /* If nrecords == 0, do nothing */
-  if (nrecords == 0)
+  if(nrecords == 0)
     return 0;
 
   if((H5TB_common_read_records(table->dset_id, table->type_id,
@@ -516,11 +514,11 @@ herr_t H5PTread_packets( hid_t table_id,
 
   /* find the table struct from its ID */
   table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type);
-  if (table == NULL)
+  if(table == NULL)
     goto out;
 
   /* If nrecords == 0, do nothing */
-  if (nrecords == 0)
+  if(nrecords == 0)
     return 0;
 
   if( H5TB_common_read_records(table->dset_id, table->type_id,
@@ -799,7 +797,7 @@ herr_t H5PTfree_vlen_readbuff( hid_t table_id,
   if((table = (htbl_t *) H5Iobject_verify(table_id, H5PT_ptable_id_type)) == NULL)
     goto out;
 
-  if ((space_id = H5Screate_simple(1, &bufflen, NULL)) < 0)
+  if((space_id = H5Screate_simple(1, &bufflen, NULL)) < 0)
     goto out;
 
   /* Free the memory.  If this succeeds, ret_value should be 0. */
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index 9f4b161..2471466 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -117,50 +117,44 @@ herr_t H5TBmake_table( const char *table_title,
   return -1;
 
  /* Modify dataset creation properties, i.e. enable chunking  */
- plist_id = H5Pcreate (H5P_DATASET_CREATE);
- if(H5Pset_chunk ( plist_id, 1, dims_chunk ) < 0)
+ plist_id = H5Pcreate(H5P_DATASET_CREATE);
+ if(H5Pset_chunk(plist_id, 1, dims_chunk) < 0)
   return -1;
 
  /* Set the fill value using a struct as the data type. */
- if(fill_data )
- {
-  if(H5Pset_fill_value( plist_id, mem_type_id, fill_data ) < 0)
+ if(fill_data)
+  if(H5Pset_fill_value(plist_id, mem_type_id, fill_data) < 0)
    return -1;
- }
 
  /*
   Dataset creation property list is modified to use
   GZIP compression with the compression effort set to 6.
   Note that compression can be used only when dataset is chunked.
   */
- if(compress )
- {
-  if(H5Pset_deflate( plist_id, 6) < 0)
+ if(compress)
+  if(H5Pset_deflate(plist_id, 6) < 0)
    return -1;
- }
 
  /* Create the dataset. */
- if((did = H5Dcreate( loc_id, dset_name, mem_type_id, sid, plist_id )) < 0)
+ if((did = H5Dcreate2(loc_id, dset_name, mem_type_id, sid, H5P_DEFAULT, plist_id, H5P_DEFAULT)) < 0)
   goto out;
 
  /* Only write if there is something to write */
- if(data )
- {
+ if(data)
   /* Write data to the dataset. */
   if(H5Dwrite( did, mem_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, data ) < 0)
    goto out;
- }
 
  /* Terminate access to the data space. */
- if(H5Sclose( sid ) < 0)
+ if(H5Sclose(sid) < 0)
   goto out;
 
  /* End access to the dataset */
- if(H5Dclose( did ) < 0)
+ if(H5Dclose(did) < 0)
   goto out;
 
  /* End access to the property list */
- if(H5Pclose( plist_id ) < 0)
+ if(H5Pclose(plist_id) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1915,11 +1909,11 @@ herr_t H5TBcombine_tables( hid_t loc_id1,
  */
 
  /* Clone the property list */
- if(( plist_id3 = H5Pcopy( plist_id1 )) < 0)
+ if((plist_id3 = H5Pcopy(plist_id1)) < 0)
   goto out;
 
  /* Clone the type id */
- if(( type_id3 = H5Tcopy( type_id1 )) < 0)
+ if((type_id3 = H5Tcopy(type_id1)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1930,18 +1924,18 @@ herr_t H5TBcombine_tables( hid_t loc_id1,
  dims[0] = 0;
 
 /* Create a simple data space with unlimited size */
- if((space_id3 = H5Screate_simple( 1, dims, maxdims )) < 0)
+ if((space_id3 = H5Screate_simple(1, dims, maxdims)) < 0)
   return -1;
 
  /* Create the dataset */
- if((dataset_id3 = H5Dcreate( loc_id1, dset_name3, type_id3, space_id3, plist_id3 )) < 0)
+ if((dataset_id3 = H5Dcreate2(loc_id1, dset_name3, type_id3, space_id3, H5P_DEFAULT, plist_id3, H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
  * Attach the conforming table attributes
  *-------------------------------------------------------------------------
  */
- if(H5TB_attach_attributes( "Merge table", loc_id1, dset_name3, nfields, type_id3 ) < 0)
+ if(H5TB_attach_attributes("Merge table", loc_id1, dset_name3, nfields, type_id3) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
@@ -1949,13 +1943,13 @@ herr_t H5TBcombine_tables( hid_t loc_id1,
  *-------------------------------------------------------------------------
  */
 
- type_size = H5Tget_size( type_id3 );
+ type_size = H5Tget_size(type_id3);
 
  /* alloc fill value attribute buffer */
- tmp_fill_buf = (unsigned char *)malloc((size_t) type_size );
+ tmp_fill_buf = (unsigned char *)malloc(type_size);
 
  /* Get the fill value attributes */
- has_fill=H5TBAget_fill( loc_id1, dset_name1, dataset_id1, tmp_fill_buf );
+ has_fill = H5TBAget_fill(loc_id1, dset_name1, dataset_id1, tmp_fill_buf);
 
 /*-------------------------------------------------------------------------
  * Attach the fill attributes from previous table
@@ -2312,14 +2306,11 @@ herr_t H5TBinsert_field( hid_t loc_id,
  /* Insert the old fields, counting with the new one */
  for ( i = 0; i < nfields + 1; i++)
  {
-
   idx = i;
   if(inserted )
    idx = i - 1;
 
-  if(i == position )
-  {
-
+  if(i == position ) { 
    /* Get the new member size */
    new_member_size = H5Tget_size( field_type );
 
@@ -2332,7 +2323,6 @@ herr_t H5TBinsert_field( hid_t loc_id,
    inserted = 1;
 
    continue;
-
   }
 
   /* Get the member name */
@@ -2356,8 +2346,6 @@ herr_t H5TBinsert_field( hid_t loc_id,
    /* Close the member type */
   if(H5Tclose( member_type_id ) < 0)
    goto out;
-
-
  } /* i */
 
 /*-------------------------------------------------------------------------
@@ -2366,20 +2354,20 @@ herr_t H5TBinsert_field( hid_t loc_id,
  */
 
  /* Retrieve the size of chunk */
- if(H5Pget_chunk( plist_id1, 1, dims_chunk ) < 0)
+ if(H5Pget_chunk(plist_id1, 1, dims_chunk) < 0)
   goto out;
 
  /* Create a new simple data space with unlimited size, using the dimension */
- if(( space_id2 = H5Screate_simple( 1, dims, maxdims )) < 0)
+ if((space_id2 = H5Screate_simple( 1, dims, maxdims)) < 0)
   return -1;
 
  /* Modify dataset creation properties, i.e. enable chunking  */
- plist_id2 = H5Pcreate (H5P_DATASET_CREATE);
- if(H5Pset_chunk ( plist_id2, 1, dims_chunk ) < 0)
+ plist_id2 = H5Pcreate(H5P_DATASET_CREATE);
+ if(H5Pset_chunk(plist_id2, 1, dims_chunk) < 0)
   return -1;
 
  /* Create the dataset. */
- if(( dataset_id2 = H5Dcreate( loc_id, "new", type_id2, space_id2, plist_id2 )) < 0)
+ if((dataset_id2 = H5Dcreate2(loc_id, "new", type_id2, space_id2, H5P_DEFAULT, plist_id2, H5P_DEFAULT)) < 0)
   goto out;
 
 
@@ -2388,20 +2376,20 @@ herr_t H5TBinsert_field( hid_t loc_id,
  *-------------------------------------------------------------------------
  */
 
- tmp_buf = (unsigned char *)calloc((size_t) nrecords, (size_t)total_size );
+ tmp_buf = (unsigned char *)calloc((size_t)nrecords, (size_t)total_size);
 
  /* Define a hyperslab in the dataset of the size of the records */
  offset[0] = 0;
  count[0]  = nrecords;
- if(H5Sselect_hyperslab( space_id1, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+ if(H5Sselect_hyperslab(space_id1, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
   goto out;
 
  /* Create a memory dataspace handle */
  mem_size[0] = count[0];
- if((mem_space_id1 = H5Screate_simple( 1, mem_size, NULL )) < 0)
+ if((mem_space_id1 = H5Screate_simple(1, mem_size, NULL)) < 0)
   goto out;
 
- if(H5Dread( dataset_id1, type_id1, mem_space_id1, H5S_ALL, H5P_DEFAULT, tmp_buf ) < 0)
+ if(H5Dread(dataset_id1, type_id1, mem_space_id1, H5S_ALL, H5P_DEFAULT, tmp_buf) < 0)
   goto out;
 
 
@@ -2837,12 +2825,11 @@ herr_t H5TBdelete_field( hid_t loc_id,
 
   curr_offset += member_size;
 
-  free( member_name );
+  free(member_name);
 
   /* Close the member type */
-  if(H5Tclose( member_type_id ) < 0)
+  if(H5Tclose(member_type_id) < 0)
    goto out;
-
  } /* i */
 
 /*-------------------------------------------------------------------------
@@ -2851,48 +2838,45 @@ herr_t H5TBdelete_field( hid_t loc_id,
  */
 
  /* Retrieve the size of chunk */
- if(H5Pget_chunk( plist_id1, 1, dims_chunk ) < 0)
+ if(H5Pget_chunk(plist_id1, 1, dims_chunk) < 0)
   goto out;
 
  /* Create a new simple data space with unlimited size, using the dimension */
- if(( space_id2 = H5Screate_simple( 1, dims, maxdims )) < 0)
+ if((space_id2 = H5Screate_simple(1, dims, maxdims)) < 0)
   return -1;
 
  /* Modify dataset creation properties, i.e. enable chunking  */
- plist_id2 = H5Pcreate (H5P_DATASET_CREATE);
- if(H5Pset_chunk ( plist_id2, 1, dims_chunk ) < 0)
+ plist_id2 = H5Pcreate(H5P_DATASET_CREATE);
+ if(H5Pset_chunk(plist_id2, 1, dims_chunk) < 0)
   return -1;
 
  /* Create the dataset. */
- if(( dataset_id2 = H5Dcreate( loc_id, "new", type_id2, space_id2, plist_id2 )) < 0)
+ if((dataset_id2 = H5Dcreate2(loc_id, "new", type_id2, space_id2, H5P_DEFAULT, plist_id2, H5P_DEFAULT)) < 0)
   goto out;
 
 /*-------------------------------------------------------------------------
  * We have to read field by field of the old dataset and save it into the new one
  *-------------------------------------------------------------------------
  */
- for ( i = 0; i < nfields; i++)
- {
-
+ for ( i = 0; i < nfields; i++) { 
   /* Get the member name */
-  member_name = H5Tget_member_name( type_id1,(unsigned) i );
+  member_name = H5Tget_member_name(type_id1, (unsigned)i);
 
   /* Skip the field to delete */
-  if(H5TB_find_field( member_name, field_name ) > 0 )
-  {
-   free( member_name );
+  if(H5TB_find_field(member_name, field_name) > 0) {
+   free(member_name);
    continue;
   }
 
   /* Get the member type */
-  if(( member_type_id = H5Tget_member_type( type_id1, (unsigned)i )) < 0)
+  if((member_type_id = H5Tget_member_type(type_id1, (unsigned)i)) < 0)
    goto out;
 
   /* Get the member size */
-  member_size = H5Tget_size( member_type_id );
+  member_size = H5Tget_size(member_type_id);
 
   /* Create a read id */
-  if(( read_type_id = H5Tcreate( H5T_COMPOUND, member_size )) < 0)
+  if((read_type_id = H5Tcreate(H5T_COMPOUND, member_size)) < 0)
    goto out;
 
   /* Insert it into the new type */
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;
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index a9b9f30..d8aeb99 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -418,7 +418,7 @@ static int test_attr(void)
     if((space_id = H5Screate_simple(1, dims, NULL)) < 0) goto out;
 
     /* Create the dataset */
-    if((dataset_id = H5Dcreate(file_id , "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT)) < 0) goto out;
+    if((dataset_id = H5Dcreate2(file_id , "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out;
 
     /* Close */
     H5Dclose(dataset_id);