[svn-r16588]

1.	#1487 (B1) DS memory leaks ISSUE 1: On a "go to" error condition, previously allocated buffers were not freed. NOTE: these are "potential" memory leaks because typically the error conditions do not occur, so the potential memory leaks also do NOT occur. ISSUE 2: A function used to read dimension scales realistic data (topography of the North Atlantic, latitude and longitude) was being called without the data buffer being freed. SOLUTION FOR ISSUE 1: added "free" calls for the allocated buffers on the error sections. SOLUTION FOR ISSUE 2:  added a "free" call after the read_data function, after using the buffer (on a H5Dwrite and H5Screate_simple). The read_data function reads both data and dimensions from the ASCII data files. DOCS: no docs added. Done for 1.9 and 1.8 STATUS: Closed bug

tested: h5committest

2 files changed, 4151 insertions, 4036 deletions

diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index f0c83f8..83bb1ed 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -1,17 +1,17 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* Copyright by The HDF Group.                                               *
+* Copyright by the Board of Trustees of the University of Illinois.         *
+* All rights reserved.                                                      *
+*                                                                           *
+* This file is part of HDF5.  The full HDF5 copyright notice, including     *
+* terms governing use, modification, and redistribution, is contained in    *
+* the files COPYING and Copyright.html.  COPYING can be found at the root   *
+* of the source code distribution tree; Copyright.html can be found at the  *
+* root level of an installed copy of the electronic HDF5 document set and   *
+* is linked from the top-level documents page.  It can also be found at     *
+* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+* access to either file, you may request a copy from help@hdfgroup.org.     *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <assert.h>
 #include <stdlib.h>
@@ -24,1203 +24,1277 @@
 
 
 /*-------------------------------------------------------------------------
- * Function: H5DSset_scale
- *
- * Purpose: The dataset DSID is converted to a Dimension Scale dataset.
- *   Creates the CLASS attribute, set to the value "DIMENSION_SCALE"
- *   and an empty REFERENCE_LIST attribute.
- *   If DIMNAME is specified, then an attribute called NAME is created,
- *   with the value DIMNAME.
- *
- * Return: Success: SUCCEED, Failure: FAIL
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 04, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSset_scale
+*
+* Purpose: The dataset DSID is converted to a Dimension Scale dataset.
+*   Creates the CLASS attribute, set to the value "DIMENSION_SCALE"
+*   and an empty REFERENCE_LIST attribute.
+*   If DIMNAME is specified, then an attribute called NAME is created,
+*   with the value DIMNAME.
+*
+* Return: Success: SUCCEED, Failure: FAIL
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 04, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 herr_t H5DSset_scale(hid_t dsid,
                      const char *dimname)
 {
- int has_dimlist;
- H5I_type_t it;
+    int has_dimlist;
+    H5I_type_t it;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* get ID type */
- if ((it = H5Iget_type(dsid)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* get ID type */
+    if ((it = H5Iget_type(dsid)) < 0)
+        return FAIL;
 
- if (H5I_DATASET!=it)
-  return FAIL;
+    if (H5I_DATASET!=it)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * check if the dataset is a dataset wich has references to dimension scales
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * check if the dataset is a dataset wich has references to dimension scales
+    *-------------------------------------------------------------------------
+    */
 
- /* try to find the attribute "DIMENSION_LIST"  */
- if ((has_dimlist = H5LT_find_attribute(dsid,DIMENSION_LIST)) < 0)
-  return FAIL;
+    /* try to find the attribute "DIMENSION_LIST"  */
+    if ((has_dimlist = H5LT_find_attribute(dsid,DIMENSION_LIST)) < 0)
+        return FAIL;
 
- if (has_dimlist == 1)
-  return FAIL;
+    if (has_dimlist == 1)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * write the standard attributes for a Dimension Scale dataset
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * write the standard attributes for a Dimension Scale dataset
+    *-------------------------------------------------------------------------
+    */
 
- if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0)
-  return FAIL;
+    if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0)
+        return FAIL;
 
- if (dimname!=NULL)
- {
-  if (H5LT_set_attribute_string(dsid,"NAME",dimname) < 0)
-   return FAIL;
- }
+    if (dimname!=NULL)
+    {
+        if (H5LT_set_attribute_string(dsid,"NAME",dimname) < 0)
+            return FAIL;
+    }
 
- return SUCCEED;
+    return SUCCEED;
 }
 
 
 
 /*-------------------------------------------------------------------------
- * Function: H5DSattach_scale
- *
- * Purpose: Define Dimension Scale DSID to be associated with dimension IDX
- *  of Dataset DID. Entries are created in the DIMENSION_LIST and
- *  REFERENCE_LIST attributes.
- *
- * Return:
- *   Success: SUCCEED
- *   Failure: FAIL
- *
- * Fails if: Bad arguments
- *           If DSID is not a Dimension Scale
- *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: December 20, 2004
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSattach_scale
+*
+* Purpose: Define Dimension Scale DSID to be associated with dimension IDX
+*  of Dataset DID. Entries are created in the DIMENSION_LIST and
+*  REFERENCE_LIST attributes.
+*
+* Return:
+*   Success: SUCCEED
+*   Failure: FAIL
+*
+* Fails if: Bad arguments
+*           If DSID is not a Dimension Scale
+*           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: December 20, 2004
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 herr_t H5DSattach_scale(hid_t did,
                         hid_t dsid,
                         unsigned int idx)
 {
- int        has_dimlist;
- int        has_reflist;
- int        is_ds;
- hssize_t   nelmts;
- hid_t      sid;          /* space ID */
- hid_t      tid = -1;     /* attribute type ID */
- hid_t      aid = -1;     /* attribute ID */
- int        rank;         /* rank of dataset */
- hsize_t    *dims;        /* dimension of the "REFERENCE_LIST" array */
- ds_list_t  dsl;          /* attribute data in the DS pointing to the dataset */
- ds_list_t  *dsbuf;       /* array of attribute data in the DS pointing to the dataset */
- hobj_ref_t ref_to_ds;    /* reference to the DS */
- hobj_ref_t ref_j;        /* iterator reference */
- hvl_t      *buf;         /* VL buffer to store in the attribute */
- hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
- H5O_info_t oi1, oi2;
- H5I_type_t it1, it2;
- int        i, len;
- int        found_ds=0;
+    int        has_dimlist;
+    int        has_reflist;
+    int        is_ds;
+    hssize_t   nelmts;
+    hid_t      sid;          /* space ID */
+    hid_t      tid = -1;     /* attribute type ID */
+    hid_t      aid = -1;     /* attribute ID */
+    int        rank;         /* rank of dataset */
+    hsize_t    *dims=NULL;   /* dimension of the "REFERENCE_LIST" array */
+    ds_list_t  dsl;          /* attribute data in the DS pointing to the dataset */
+    ds_list_t  *dsbuf=NULL;  /* array of attribute data in the DS pointing to the dataset */
+    hobj_ref_t ref_to_ds;    /* reference to the DS */
+    hobj_ref_t ref_j;        /* iterator reference */
+    hvl_t      *buf=NULL;    /* VL buffer to store in the attribute */
+    hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
+    H5O_info_t oi1, oi2;
+    H5I_type_t it1, it2;
+    int        i, len;
+    int        found_ds=0;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* the dataset cannot be a DS dataset */
- if ((H5DSis_scale(did))==1)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* the dataset cannot be a DS dataset */
+    if ((H5DSis_scale(did))==1)
+        return FAIL;
 
- /* get info for the dataset in the parameter list */
- if(H5Oget_info(did, &oi1) < 0)
-  return FAIL;
+    /* get info for the dataset in the parameter list */
+    if(H5Oget_info(did, &oi1) < 0)
+        return FAIL;
 
- /* get info for the scale in the parameter list */
- if(H5Oget_info(dsid, &oi2) < 0)
-  return FAIL;
+    /* get info for the scale in the parameter list */
+    if(H5Oget_info(dsid, &oi2) < 0)
+        return FAIL;
 
- /* same object, not valid */
- if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
-  return FAIL;
+    /* same object, not valid */
+    if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
+        return FAIL;
 
- /* get ID type */
- if ((it1 = H5Iget_type(did)) < 0)
-  return FAIL;
- if ((it2 = H5Iget_type(dsid)) < 0)
-  return FAIL;
+    /* get ID type */
+    if ((it1 = H5Iget_type(did)) < 0)
+        return FAIL;
+    if ((it2 = H5Iget_type(dsid)) < 0)
+        return FAIL;
 
- if (H5I_DATASET!=it1 || H5I_DATASET!=it2)
-  return FAIL;
+    if (H5I_DATASET!=it1 || H5I_DATASET!=it2)
+        return FAIL;
 
- /* the DS dataset cannot have dimension scales */
- if (H5LT_find_attribute(dsid,DIMENSION_LIST)==1)
-  return FAIL;
+    /* the DS dataset cannot have dimension scales */
+    if (H5LT_find_attribute(dsid,DIMENSION_LIST)==1)
+        return FAIL;
 
- /* check if the dataset is a "reserved" dataset (image, table) */
- if (H5DS_is_reserved(did)==1)
-  return FAIL;
+    /* check if the dataset is a "reserved" dataset (image, table) */
+    if (H5DS_is_reserved(did)==1)
+        return FAIL;
 
 
-/*-------------------------------------------------------------------------
- * The dataset may or may not have the associated DS attribute
- * First we try to open to see if it is already there; if not, it is created.
- * If it exists, the array of references is extended to hold the reference
- * to the new DS
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * The dataset may or may not have the associated DS attribute
+    * First we try to open to see if it is already there; if not, it is created.
+    * If it exists, the array of references is extended to hold the reference
+    * to the new DS
+    *-------------------------------------------------------------------------
+    */
 
- /* get dataset space */
- if ((sid = H5Dget_space(did)) < 0)
-  return FAIL;
+    /* get dataset space */
+    if ((sid = H5Dget_space(did)) < 0)
+        return FAIL;
 
- /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
+    /* get rank */
+    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
 
- /* scalar rank */
- if (rank==0)
-  rank=1;
+    /* scalar rank */
+    if (rank==0)
+        rank=1;
 
- /* close dataset space */
- if (H5Sclose(sid) < 0)
-  return FAIL;
+    /* close dataset space */
+    if (H5Sclose(sid) < 0)
+        return FAIL;
 
- /* parameter range checking */
- if (idx>(unsigned)rank-1)
-  return FAIL;
+    /* parameter range checking */
+    if (idx>(unsigned)rank-1)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * two references are created: one to the DS, saved in "DIMENSION_LIST"
- *  and one to the dataset, saved in "REFERENCE_LIST"
- *-------------------------------------------------------------------------
- */
- /* create a reference for the >>DS<< dataset */
- if (H5Rcreate(&ref_to_ds,dsid,".",H5R_OBJECT,-1) < 0)
-  return FAIL;
-
- /* create a reference for the >>data<< dataset */
- if (H5Rcreate(&dsl.ref,did,".",H5R_OBJECT,-1) < 0)
-  return FAIL;
-
- /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
- if ((has_dimlist = H5LT_find_attribute(did,DIMENSION_LIST)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * two references are created: one to the DS, saved in "DIMENSION_LIST"
+    *  and one to the dataset, saved in "REFERENCE_LIST"
+    *-------------------------------------------------------------------------
+    */
+    /* create a reference for the >>DS<< dataset */
+    if (H5Rcreate(&ref_to_ds,dsid,".",H5R_OBJECT,-1) < 0)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * it does not exist. we create the attribute and its reference data
- *-------------------------------------------------------------------------
- */
- if (has_dimlist == 0)
- {
-  /* create one entry array */
-  dims = (hsize_t*) malloc (1 * sizeof (hsize_t));
-
-  if(dims == NULL)
-   return FAIL;
-
-  dims[0] = rank;
-
-  /* space for the attribute */
-  if((sid = H5Screate_simple(1, dims, NULL)) < 0)
-   return FAIL;
-
-  /* create the type for the attribute "DIMENSION_LIST" */
-  if((tid = H5Tvlen_create(H5T_STD_REF_OBJ)) < 0)
-   goto out;
-
-  /* create the attribute */
-  if((aid = H5Acreate2(did, DIMENSION_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-   goto out;
-
-  /* allocate and initialize the VL */
-  buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
-
-  if(buf == NULL)
-   goto out;
-
-  for(i = 0; i < rank; i++) {
-   buf[i].len = 0;
-   buf[i].p = NULL;
-  }
-
-  /* store the REF information in the index of the dataset that has the DS */
-  buf[idx].len = 1;
-  buf[idx].p = malloc( 1 * sizeof(hobj_ref_t));
-  ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds;
-
-  /* write the attribute with the reference */
-  if (H5Awrite(aid,tid,buf) < 0)
-   goto out;
-
-  /* close */
-  if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
-   goto out;
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Tclose(tid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
-
-  if (dims)
-   free(dims);
-  if (buf)
-   free(buf);
-
- }
+    /* create a reference for the >>data<< dataset */
+    if (H5Rcreate(&dsl.ref,did,".",H5R_OBJECT,-1) < 0)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * the attribute already exists, open it, extend the buffer,
- *  and insert the new reference
- *-------------------------------------------------------------------------
- */
-
- else if ( has_dimlist == 1 )
- {
-  if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
-   goto out;
-
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
-
-  if((sid = H5Aget_space(aid)) < 0)
-   goto out;
-
-  /* allocate and initialize the VL */
-  buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
-
-  if(buf == NULL)
-   goto out;
-
-  /* read */
-  if(H5Aread(aid, tid, buf) < 0)
-   goto out;
-
-  /* check to avoid inserting duplicates. it is not FAIL, just do nothing */
-  /* iterate all the REFs in this dimension IDX */
-  for (i=0; i<(int)buf[idx].len; i++)
-  {
-   /* get the reference */
-   ref_j = ((hobj_ref_t *)buf[idx].p)[i];
-
-   /* get the scale id for this REF */
-   if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref_j)) < 0)
-    goto out;
-
-   /* get info for DS in the parameter list */
-   if(H5Oget_info(dsid, &oi1) < 0)
-    goto out;
-
-   /* get info for this DS */
-   if(H5Oget_info(dsid_j, &oi2) < 0)
-    goto out;
-
-   /* same object, so this DS scale is already in this DIM IDX */
-   if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
-    found_ds = 1;
-
-   /* close the dereferenced dataset */
-   if (H5Dclose(dsid_j) < 0)
-    goto out;
-  }
-
-  if (found_ds==0)
-  {
-  /* we are adding one more DS to this dimension */
-   if ( buf[idx].len > 0 )
-   {
-    buf[idx].len++;
-    len = buf[idx].len;
-    buf[idx].p = realloc( buf[idx].p, len * sizeof(hobj_ref_t));
-    ((hobj_ref_t *)buf[idx].p)[ len-1 ] = ref_to_ds;
-   }
-   else
-   {
-    /* store the REF information in the index of the dataset that has the DS */
-    buf[idx].len = 1;
-    buf[idx].p = malloc( 1 * sizeof(hobj_ref_t));
-    ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds;
-   }
-  }
-
-  /* write the attribute with the new references */
-  if (H5Awrite(aid,tid,buf) < 0)
-   goto out;
-
-  /* close */
-  if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
-   goto out;
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Tclose(tid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
-  if (buf)
-   free(buf);
-
- } /* has_dimlist */
+    /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
+    if ((has_dimlist = H5LT_find_attribute(did,DIMENSION_LIST)) < 0)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * save DS info on the >>DS<< dataset
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * it does not exist. we create the attribute and its reference data
+    *-------------------------------------------------------------------------
+    */
+    if (has_dimlist == 0)
+    {
+        /* create one entry array */
+        dims = (hsize_t*) malloc (1 * sizeof (hsize_t));
 
- /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
- if ((has_reflist = H5LT_find_attribute(dsid,REFERENCE_LIST)) < 0)
-  goto out;
+        if(dims == NULL)
+            return FAIL;
 
-/*-------------------------------------------------------------------------
- * it does not exist. we create the attribute and its reference data
- *-------------------------------------------------------------------------
- */
- if (has_reflist == 0)
- {
-  /* create one entry array */
-  dims = (hsize_t*) malloc (1 * sizeof (hsize_t));
-
-  if (dims == NULL)
-   goto out;
-
-  dims[0] = 1;
-
-  /* space for the attribute */
-  if ((sid = H5Screate_simple(1,dims,NULL)) < 0)
-   goto out;
-
-  /* create the compound datatype for the attribute "REFERENCE_LIST" */
-  if((tid = H5Tcreate(H5T_COMPOUND, sizeof(ds_list_t))) < 0)
-   goto out;
-
-  /* insert reference field */
-  if(H5Tinsert(tid, "dataset", HOFFSET(ds_list_t,ref), H5T_STD_REF_OBJ) < 0)
-   goto out;
-
-  /* insert dimension idx of the dataset field */
-  if(H5Tinsert(tid, "dimension", HOFFSET(ds_list_t, dim_idx), H5T_NATIVE_INT) < 0)
-   goto out;
-
-  /* create the attribute */
-  if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-   goto out;
-
-  /* store the IDX information */
-  dsl.dim_idx = idx;
-
-  /* write the attribute with the reference */
-  if(H5Awrite(aid, tid, &dsl) < 0)
-   goto out;
-
-  /* close */
-  if(H5Sclose(sid) < 0)
-   goto out;
-  if(H5Tclose(tid) < 0)
-   goto out;
-  if(H5Aclose(aid) < 0)
-   goto out;
-
-  if(dims)
-   free(dims);
- }
+        dims[0] = rank;
 
-/*-------------------------------------------------------------------------
- * the "REFERENCE_LIST" array already exists, open it and extend it
- *-------------------------------------------------------------------------
- */
+        /* space for the attribute */
+        if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+            return FAIL;
 
- else if(has_reflist ==  1)
- {
-  if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
-   goto out;
+        /* create the type for the attribute "DIMENSION_LIST" */
+        if((tid = H5Tvlen_create(H5T_STD_REF_OBJ)) < 0)
+            goto out;
 
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
+        /* create the attribute */
+        if((aid = H5Acreate2(did, DIMENSION_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
 
-  /* get and save the old reference(s) */
-  if((sid = H5Aget_space(aid)) < 0)
-   goto out;
+        /* allocate and initialize the VL */
+        buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
 
-  if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
-   goto out;
+        if(buf == NULL)
+            goto out;
 
-  nelmts++;
+        for(i = 0; i < rank; i++) {
+            buf[i].len = 0;
+            buf[i].p = NULL;
+        }
 
-  dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+        /* store the REF information in the index of the dataset that has the DS */
+        buf[idx].len = 1;
+        buf[idx].p = malloc( 1 * sizeof(hobj_ref_t));
+        ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds;
 
-  if (dsbuf == NULL)
-   goto out;
+        /* write the attribute with the reference */
+        if (H5Awrite(aid,tid,buf) < 0)
+            goto out;
 
-  if (H5Aread(aid,tid,dsbuf) < 0)
-   goto out;
+        /* close */
+        if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+            goto out;
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
 
-  /* close */
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
+        if (dims)
+        {
+            free(dims);
+            dims = NULL;
+        }
+        if (buf)
+        {
+            free(buf);
+            buf = NULL;
+        }
 
-/*-------------------------------------------------------------------------
- * create a new attribute
- *-------------------------------------------------------------------------
- */
+    }
+
+    /*-------------------------------------------------------------------------
+    * the attribute already exists, open it, extend the buffer,
+    *  and insert the new reference
+    *-------------------------------------------------------------------------
+    */
+
+    else if ( has_dimlist == 1 )
+    {
+        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+            goto out;
 
-  /* the attribute must be deleted, in order to the new one can reflect the changes*/
-  if(H5Adelete(dsid, REFERENCE_LIST) < 0)
-   goto out;
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
 
-  /* store the IDX information (index of the dataset that has the DS) */
-  dsl.dim_idx = idx;
-  dsbuf[nelmts-1] = dsl;
+        if((sid = H5Aget_space(aid)) < 0)
+            goto out;
 
-  /* create a new data space for the new references array */
-  dims = (hsize_t *)malloc((size_t)nelmts * sizeof(hsize_t));
-  if(dims == NULL)
-   goto out;
-  dims[0] = nelmts;
+        /* allocate and initialize the VL */
+        buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
 
-  if((sid = H5Screate_simple(1, dims, NULL)) < 0)
-   goto out;
+        if(buf == NULL)
+            goto out;
+
+        /* read */
+        if(H5Aread(aid, tid, buf) < 0)
+            goto out;
 
-  if(dims)
-   free(dims);
+        /* check to avoid inserting duplicates. it is not FAIL, just do nothing */
+        /* iterate all the REFs in this dimension IDX */
+        for (i=0; i<(int)buf[idx].len; i++)
+        {
+            /* get the reference */
+            ref_j = ((hobj_ref_t *)buf[idx].p)[i];
 
-  /* create the attribute again with the changes of space */
-  if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-   goto out;
+            /* get the scale id for this REF */
+            if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref_j)) < 0)
+                goto out;
 
-  /* write the attribute with the new references */
-  if(H5Awrite(aid, tid, dsbuf) < 0)
-   goto out;
+            /* get info for DS in the parameter list */
+            if(H5Oget_info(dsid, &oi1) < 0)
+                goto out;
 
-  /* close */
-  if(H5Sclose(sid) < 0)
-   goto out;
-  if(H5Tclose(tid) < 0)
-   goto out;
-  if(H5Aclose(aid) < 0)
-   goto out;
+            /* get info for this DS */
+            if(H5Oget_info(dsid_j, &oi2) < 0)
+                goto out;
 
-  if (dsbuf)
-   free(dsbuf);
+            /* same object, so this DS scale is already in this DIM IDX */
+            if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
+                found_ds = 1;
 
- } /* has_reflist */
+            /* close the dereferenced dataset */
+            if (H5Dclose(dsid_j) < 0)
+                goto out;
+        }
 
-/*-------------------------------------------------------------------------
- * write the standard attributes for a Dimension Scale dataset
- *-------------------------------------------------------------------------
- */
+        if (found_ds==0)
+        {
+            /* we are adding one more DS to this dimension */
+            if ( buf[idx].len > 0 )
+            {
+                buf[idx].len++;
+                len = buf[idx].len;
+                buf[idx].p = realloc( buf[idx].p, len * sizeof(hobj_ref_t));
+                ((hobj_ref_t *)buf[idx].p)[ len-1 ] = ref_to_ds;
+            }
+            else
+            {
+                /* store the REF information in the index of the dataset that has the DS */
+                buf[idx].len = 1;
+                buf[idx].p = malloc( 1 * sizeof(hobj_ref_t));
+                ((hobj_ref_t *)buf[idx].p)[0] = ref_to_ds;
+            }
+        }
+
+        /* write the attribute with the new references */
+        if (H5Awrite(aid,tid,buf) < 0)
+            goto out;
+
+        /* close */
+        if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+            goto out;
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
+        if (buf)
+        {
+            free(buf);
+            buf = NULL;
+        }
+
+    } /* has_dimlist */
+
+    /*-------------------------------------------------------------------------
+    * save DS info on the >>DS<< dataset
+    *-------------------------------------------------------------------------
+    */
+
+    /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
+    if ((has_reflist = H5LT_find_attribute(dsid,REFERENCE_LIST)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * it does not exist. we create the attribute and its reference data
+    *-------------------------------------------------------------------------
+    */
+    if (has_reflist == 0)
+    {
+        /* create one entry array */
+        dims = (hsize_t*) malloc (1 * sizeof (hsize_t));
+
+        if (dims == NULL)
+            goto out;
+
+        dims[0] = 1;
+
+        /* space for the attribute */
+        if ((sid = H5Screate_simple(1,dims,NULL)) < 0)
+            goto out;
+
+        /* create the compound datatype for the attribute "REFERENCE_LIST" */
+        if((tid = H5Tcreate(H5T_COMPOUND, sizeof(ds_list_t))) < 0)
+            goto out;
+
+        /* insert reference field */
+        if(H5Tinsert(tid, "dataset", HOFFSET(ds_list_t,ref), H5T_STD_REF_OBJ) < 0)
+            goto out;
+
+        /* insert dimension idx of the dataset field */
+        if(H5Tinsert(tid, "dimension", HOFFSET(ds_list_t, dim_idx), H5T_NATIVE_INT) < 0)
+            goto out;
+
+        /* create the attribute */
+        if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
+
+        /* store the IDX information */
+        dsl.dim_idx = idx;
+
+        /* write the attribute with the reference */
+        if(H5Awrite(aid, tid, &dsl) < 0)
+            goto out;
+
+        /* close */
+        if(H5Sclose(sid) < 0)
+            goto out;
+        if(H5Tclose(tid) < 0)
+            goto out;
+        if(H5Aclose(aid) < 0)
+            goto out;
+
+        if(dims)
+        {
+            free(dims);
+            dims = NULL;
+        }
+    }
+
+    /*-------------------------------------------------------------------------
+    * the "REFERENCE_LIST" array already exists, open it and extend it
+    *-------------------------------------------------------------------------
+    */
+
+    else if(has_reflist ==  1)
+    {
+        if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
+            goto out;
+
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
+
+        /* get and save the old reference(s) */
+        if((sid = H5Aget_space(aid)) < 0)
+            goto out;
+
+        if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+            goto out;
+
+        nelmts++;
+
+        dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+
+        if (dsbuf == NULL)
+            goto out;
+
+        if (H5Aread(aid,tid,dsbuf) < 0)
+            goto out;
 
- if ((is_ds=H5DSis_scale(dsid)) < 0)
-  return FAIL;
+        /* close */
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
+
+        /*-------------------------------------------------------------------------
+        * create a new attribute
+        *-------------------------------------------------------------------------
+        */
+
+        /* the attribute must be deleted, in order to the new one can reflect the changes*/
+        if(H5Adelete(dsid, REFERENCE_LIST) < 0)
+            goto out;
+
+        /* store the IDX information (index of the dataset that has the DS) */
+        dsl.dim_idx = idx;
+        dsbuf[nelmts-1] = dsl;
+
+        /* create a new data space for the new references array */
+        dims = (hsize_t *)malloc((size_t)nelmts * sizeof(hsize_t));
+        if(dims == NULL)
+            goto out;
+        dims[0] = nelmts;
+
+        if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+            goto out;
+
+        if (dims)
+        {
+            free(dims);
+            dims = NULL;
+        }
 
- if (is_ds == 0 )
- {
-  if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0)
-   return FAIL;
- }
+        /* create the attribute again with the changes of space */
+        if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
 
- return SUCCEED;
+        /* write the attribute with the new references */
+        if(H5Awrite(aid, tid, dsbuf) < 0)
+            goto out;
 
-/* error zone, gracefully close */
+        /* close */
+        if(H5Sclose(sid) < 0)
+            goto out;
+        if(H5Tclose(tid) < 0)
+            goto out;
+        if(H5Aclose(aid) < 0)
+            goto out;
+
+        if (dsbuf)
+        {
+            free(dsbuf);
+            dsbuf = NULL;
+        }
+
+    } /* has_reflist */
+
+    /*-------------------------------------------------------------------------
+    * write the standard attributes for a Dimension Scale dataset
+    *-------------------------------------------------------------------------
+    */
+
+    if ((is_ds=H5DSis_scale(dsid)) < 0)
+        return FAIL;
+
+    if (is_ds == 0 )
+    {
+        if (H5LT_set_attribute_string(dsid,"CLASS",DIMENSION_SCALE_CLASS) < 0)
+            return FAIL;
+    }
+
+    return SUCCEED;
+
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
-  H5Aclose(aid);
-  H5Tclose(tid);
- } H5E_END_TRY;
- return FAIL;
+
+    if (dims)
+    {
+        free(dims);
+        dims = NULL;
+    }
+    if (buf)
+    {
+        free(buf);
+        buf = NULL;
+    }
+    if (dsbuf)
+    {
+        free(dsbuf);
+        dsbuf = NULL;
+    }
+
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSdetach_scale
- *
- * Purpose: If possible, deletes association of Dimension Scale DSID with
- *     dimension IDX of Dataset DID. This deletes the entries in the
- *     DIMENSION_LIST and REFERENCE_LIST attributes.
- *
- * Return:
- *   Success: SUCCEED
- *   Failure: FAIL
- *
- * Fails if: Bad arguments
- *           The dataset DID or DSID do not exist.
- *           The DSID is not a Dimension Scale
- *           DSID is not attached to DID.
- * Note that a scale may be associated with more than dimension of the same dataset.
- * If so, the detach operation only deletes one of the associations, for DID.
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: December 20, 2004
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSdetach_scale
+*
+* Purpose: If possible, deletes association of Dimension Scale DSID with
+*     dimension IDX of Dataset DID. This deletes the entries in the
+*     DIMENSION_LIST and REFERENCE_LIST attributes.
+*
+* Return:
+*   Success: SUCCEED
+*   Failure: FAIL
+*
+* Fails if: Bad arguments
+*           The dataset DID or DSID do not exist.
+*           The DSID is not a Dimension Scale
+*           DSID is not attached to DID.
+* Note that a scale may be associated with more than dimension of the same dataset.
+* If so, the detach operation only deletes one of the associations, for DID.
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: December 20, 2004
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 herr_t H5DSdetach_scale(hid_t did,
                         hid_t dsid,
                         unsigned int idx)
 {
- int        has_dimlist;
- int        has_reflist;
- hssize_t   nelmts;
- hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
+    int        has_dimlist;
+    int        has_reflist;
+    hssize_t   nelmts;
+    hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
     hid_t      did_i;        /* dataset ID in REFERENCE_LIST */
- hid_t      sid;          /* space ID */
- hid_t      tid = -1;     /* attribute type ID */
- hid_t      aid = -1;     /* attribute ID */
- int        rank;         /* rank of dataset */
- ds_list_t  *dsbuf = NULL;  /* array of attribute data in the DS pointing to the dataset */
- ds_list_t  *dsbufn = NULL; /* array of attribute data in the DS pointing to the dataset */
- hsize_t    *dims = NULL;   /* dimension of the "REFERENCE_LIST" array */
- hobj_ref_t ref;          /* reference to the DS */
- hvl_t      *buf = NULL;  /* VL buffer to store in the attribute */
- unsigned   i, j, jj;
- H5O_info_t oi1, oi2, oi3, oi4;
- int        found_dset = 0, found_ds = 0;
- H5I_type_t it1, it2;
+    hid_t      sid;          /* space ID */
+    hid_t      tid = -1;     /* attribute type ID */
+    hid_t      aid = -1;     /* attribute ID */
+    int        rank;         /* rank of dataset */
+    ds_list_t  *dsbuf = NULL;  /* array of attribute data in the DS pointing to the dataset */
+    ds_list_t  *dsbufn = NULL; /* array of attribute data in the DS pointing to the dataset */
+    hsize_t    *dims = NULL;   /* dimension of the "REFERENCE_LIST" array */
+    hobj_ref_t ref;          /* reference to the DS */
+    hvl_t      *buf = NULL;  /* VL buffer to store in the attribute */
+    unsigned   i, j, jj;
+    H5O_info_t oi1, oi2, oi3, oi4;
+    int        found_dset = 0, found_ds = 0;
+    H5I_type_t it1, it2;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* the dataset cannot be a DS dataset */
- if ((H5DSis_scale(did))==1)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* the dataset cannot be a DS dataset */
+    if ((H5DSis_scale(did))==1)
+        return FAIL;
 
- /* get info for the dataset in the parameter list */
- if(H5Oget_info(did, &oi1) < 0)
-  return FAIL;
+    /* get info for the dataset in the parameter list */
+    if(H5Oget_info(did, &oi1) < 0)
+        return FAIL;
 
- /* get info for the scale in the parameter list */
- if(H5Oget_info(dsid, &oi2) < 0)
-  return FAIL;
+    /* get info for the scale in the parameter list */
+    if(H5Oget_info(dsid, &oi2) < 0)
+        return FAIL;
 
- /* same object, not valid */
- if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
-  return FAIL;
+    /* same object, not valid */
+    if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
+        return FAIL;
 
- /* get ID type */
- if ((it1 = H5Iget_type(did)) < 0)
-  return FAIL;
- if ((it2 = H5Iget_type(dsid)) < 0)
-  return FAIL;
+    /* get ID type */
+    if ((it1 = H5Iget_type(did)) < 0)
+        return FAIL;
+    if ((it2 = H5Iget_type(dsid)) < 0)
+        return FAIL;
 
- if (H5I_DATASET!=it1 || H5I_DATASET!=it2)
-  return FAIL;
+    if (H5I_DATASET!=it1 || H5I_DATASET!=it2)
+        return FAIL;
 
 
-/*-------------------------------------------------------------------------
- * Find "DIMENSION_LIST"
- *-------------------------------------------------------------------------
- */
- /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
- if ((has_dimlist = H5LT_find_attribute(did,DIMENSION_LIST)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * Find "DIMENSION_LIST"
+    *-------------------------------------------------------------------------
+    */
+    /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
+    if ((has_dimlist = H5LT_find_attribute(did,DIMENSION_LIST)) < 0)
+        return FAIL;
 
- if (has_dimlist == 0)
-  return FAIL;
+    if (has_dimlist == 0)
+        return FAIL;
 
- /* get dataset space */
- if ((sid = H5Dget_space(did)) < 0)
-  return FAIL;
+    /* get dataset space */
+    if ((sid = H5Dget_space(did)) < 0)
+        return FAIL;
 
- /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
+    /* get rank */
+    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
 
- /* close dataset space */
- if (H5Sclose(sid) < 0)
-  return FAIL;
+    /* close dataset space */
+    if (H5Sclose(sid) < 0)
+        return FAIL;
 
 
-/*-------------------------------------------------------------------------
- * find "REFERENCE_LIST"
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * find "REFERENCE_LIST"
+    *-------------------------------------------------------------------------
+    */
 
- /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
- if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
-  return FAIL;
+    /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
+    if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
+        return FAIL;
 
- if(has_reflist == 0)
-  return FAIL;
+    if(has_reflist == 0)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * open "DIMENSION_LIST", and delete the reference
- *-------------------------------------------------------------------------
- */
-
- if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
-  return FAIL;
-
- if((tid = H5Aget_type(aid)) < 0)
-  goto out;
-
- if((sid = H5Aget_space(aid)) < 0)
-  goto out;
-
- /* allocate and initialize the VL */
- buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
-
- if(buf == NULL)
-  goto out;
-
- /* read */
- if (H5Aread(aid,tid,buf) < 0)
-  goto out;
-
- /* reset */
- if ( buf[idx].len > 0 )
- {
-  for (j=0; j<buf[idx].len; j++)
-  {
-   /* get the reference */
-   ref = ((hobj_ref_t *)buf[idx].p)[j];
-
-   /* get the DS id */
-   if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
-    goto out;
-
-   /* get info for DS in the parameter list */
-   if(H5Oget_info(dsid, &oi1) < 0)
-    goto out;
-
-   /* get info for this DS */
-   if(H5Oget_info(dsid_j, &oi2) < 0)
-    goto out;
-
-   /* same object, reset */
-   if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr) {
-    for(jj=j; jj<buf[idx].len-1; jj++)
-     ((hobj_ref_t *)buf[idx].p)[jj] = ((hobj_ref_t *)buf[idx].p)[jj+1];
-    buf[idx].len--;
-
-    found_ds = 1;
-
-    /* close the dereferenced dataset and break */
-    if (H5Dclose(dsid_j) < 0)
-     goto out;
-    break;
-   }
-
-   /* close the dereferenced dataset */
-   if (H5Dclose(dsid_j) < 0)
-    goto out;
-  } /* j */
- } /* if */
-
- /* write the attribute */
- if (H5Awrite(aid,tid,buf) < 0)
-  goto out;
-
- /* close */
- if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
-  goto out;
- if (H5Sclose(sid) < 0)
-  goto out;
- if (H5Tclose(tid) < 0)
-  goto out;
- if(H5Aclose(aid) < 0)
-  goto out;
- if(buf)
-  free(buf);
-
- /* the scale must be present */
- if(found_ds == 0)
-  goto out;
+    /*-------------------------------------------------------------------------
+    * open "DIMENSION_LIST", and delete the reference
+    *-------------------------------------------------------------------------
+    */
 
-/*-------------------------------------------------------------------------
- * the "REFERENCE_LIST" array exists, update
- *-------------------------------------------------------------------------
- */
+    if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+        return FAIL;
 
- if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
-  goto out;
+    if((tid = H5Aget_type(aid)) < 0)
+        goto out;
 
- if((tid = H5Aget_type(aid)) < 0)
-  goto out;
+    if((sid = H5Aget_space(aid)) < 0)
+        goto out;
 
- /* get and save the old reference(s) */
- if((sid = H5Aget_space(aid)) < 0)
-  goto out;
+    /* allocate and initialize the VL */
+    buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
 
- if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
-  goto out;
+    if(buf == NULL)
+        goto out;
 
- dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
- if(dsbuf == NULL)
-  goto out;
+    /* read */
+    if (H5Aread(aid,tid,buf) < 0)
+        goto out;
 
- if (H5Aread(aid,tid,dsbuf) < 0)
-  goto out;
+    /* reset */
+    if ( buf[idx].len > 0 )
+    {
+        for (j=0; j<buf[idx].len; j++)
+        {
+            /* get the reference */
+            ref = ((hobj_ref_t *)buf[idx].p)[j];
+
+            /* get the DS id */
+            if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
+                goto out;
+
+            /* get info for DS in the parameter list */
+            if(H5Oget_info(dsid, &oi1) < 0)
+                goto out;
+
+            /* get info for this DS */
+            if(H5Oget_info(dsid_j, &oi2) < 0)
+                goto out;
+
+            /* same object, reset */
+            if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr) {
+                for(jj=j; jj<buf[idx].len-1; jj++)
+                    ((hobj_ref_t *)buf[idx].p)[jj] = ((hobj_ref_t *)buf[idx].p)[jj+1];
+                buf[idx].len--;
+
+                found_ds = 1;
+
+                /* close the dereferenced dataset and break */
+                if (H5Dclose(dsid_j) < 0)
+                    goto out;
+                break;
+            }
+
+            /* close the dereferenced dataset */
+            if (H5Dclose(dsid_j) < 0)
+                goto out;
+        } /* j */
+    } /* if */
+
+    /* write the attribute */
+    if (H5Awrite(aid,tid,buf) < 0)
+        goto out;
 
- for(i=0; i<nelmts; i++)
- {
-  /* get the reference to the dataset */
-  ref = dsbuf[i].ref;
+    /* close */
+    if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
 
-  /* get the dataset id */
-  if ((did_i = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
-   goto out;
+    if (buf)
+    {
+        free(buf);
+        buf = NULL;
+    }
 
-  /* get info for dataset in the parameter list */
-  if(H5Oget_info(did, &oi3) < 0)
-   goto out;
+    /* the scale must be present */
+    if(found_ds == 0)
+        goto out;
 
-  /* get info for this dataset */
-  if(H5Oget_info(did_i, &oi4) < 0)
-   goto out;
+    /*-------------------------------------------------------------------------
+    * the "REFERENCE_LIST" array exists, update
+    *-------------------------------------------------------------------------
+    */
 
-  /* same object, reset. we want to detach only for this DIM */
-  if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && (int)idx == dsbuf[i].dim_idx) {
-   for(jj=i; jj<nelmts-1; jj++)
-    dsbuf[jj] = dsbuf[jj+1];
-   nelmts--;
-   found_dset=1;
+    if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
+        goto out;
 
-   /* close the dereferenced dataset and break */
-   if (H5Dclose(did_i) < 0)
-    goto out;
-   break;
-  } /* if */
+    if((tid = H5Aget_type(aid)) < 0)
+        goto out;
 
-  /* close the dereferenced dataset */
-  if (H5Dclose(did_i) < 0)
-   goto out;
+    /* get and save the old reference(s) */
+    if((sid = H5Aget_space(aid)) < 0)
+        goto out;
 
- } /* i */
+    if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+        goto out;
 
- /* close space and attribute */
- if (H5Sclose(sid) < 0)
-  goto out;
- if (H5Aclose(aid) < 0)
-  goto out;
+    dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+    if(dsbuf == NULL)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * check if we found the pointed dataset
- *-------------------------------------------------------------------------
- */
+    if (H5Aread(aid,tid,dsbuf) < 0)
+        goto out;
 
- /* the pointed dataset must exist */
- if (found_dset == 0)
-  goto out;
+    for(i=0; i<nelmts; i++)
+    {
+        /* get the reference to the dataset */
+        ref = dsbuf[i].ref;
 
-/*-------------------------------------------------------------------------
- * create a new attribute
- *-------------------------------------------------------------------------
- */
-
- /* the attribute must be deleted, in order to the new one can reflect the changes*/
- if(H5Adelete(dsid, REFERENCE_LIST) < 0)
-  goto out;
-
- /* don't do anything for an empty array */
- if(nelmts)
- {
-  /* create a new data space for the new references array */
-  dims = (hsize_t*)malloc((size_t)nelmts * sizeof (hsize_t));
-  if(dims == NULL)
-   goto out;
-  dims[0] = nelmts;
-
-  dsbufn = malloc((size_t)nelmts * sizeof(ds_list_t));
-  if(dsbufn == NULL)
-   goto out;
-
-  /* store the new information */
-  for(i = 0; i < nelmts; i++)
-   dsbufn[i] = dsbuf[i];
-
-  if((sid = H5Screate_simple(1, dims, NULL)) < 0)
-   goto out;
-
-  /* create the attribute again with the changes of space */
-  if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-   goto out;
-
-  /* write the new attribute with the new references */
-  if(H5Awrite(aid, tid, dsbufn) < 0)
-   goto out;
-
-  /* close space and attribute */
-  if(H5Sclose(sid) < 0)
-   goto out;
-  if(H5Aclose(aid) < 0)
-   goto out;
- } /* nelmts */
-
- /* close type */
- if (H5Tclose(tid) < 0)
-  goto out;
-
- if (dsbuf) {
-  free(dsbuf);
-  dsbuf=NULL;
- }
- if (dsbufn) {
-  free(dsbufn);
-  dsbufn=NULL;
- }
- if (dims) {
-  free(dims);
-  dims=NULL;
- }
-
-
- return SUCCEED;
-
-/* error zone, gracefully close */
+        /* get the dataset id */
+        if ((did_i = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
+            goto out;
+
+        /* get info for dataset in the parameter list */
+        if(H5Oget_info(did, &oi3) < 0)
+            goto out;
+
+        /* get info for this dataset */
+        if(H5Oget_info(did_i, &oi4) < 0)
+            goto out;
+
+        /* same object, reset. we want to detach only for this DIM */
+        if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && (int)idx == dsbuf[i].dim_idx) {
+            for(jj=i; jj<nelmts-1; jj++)
+                dsbuf[jj] = dsbuf[jj+1];
+            nelmts--;
+            found_dset=1;
+
+            /* close the dereferenced dataset and break */
+            if (H5Dclose(did_i) < 0)
+                goto out;
+            break;
+        } /* if */
+
+        /* close the dereferenced dataset */
+        if (H5Dclose(did_i) < 0)
+            goto out;
+
+    } /* i */
+
+    /* close space and attribute */
+    if (H5Sclose(sid) < 0)
+        goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * check if we found the pointed dataset
+    *-------------------------------------------------------------------------
+    */
+
+    /* the pointed dataset must exist */
+    if (found_dset == 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create a new attribute
+    *-------------------------------------------------------------------------
+    */
+
+    /* the attribute must be deleted, in order to the new one can reflect the changes*/
+    if (H5Adelete(dsid, REFERENCE_LIST) < 0)
+        goto out;
+
+    /* don't do anything for an empty array */
+    if(nelmts)
+    {
+        /* create a new data space for the new references array */
+        dims = (hsize_t*)malloc((size_t)nelmts * sizeof (hsize_t));
+        if(dims == NULL)
+            goto out;
+        dims[0] = nelmts;
+
+        dsbufn = malloc((size_t)nelmts * sizeof(ds_list_t));
+        if(dsbufn == NULL)
+            goto out;
+
+        /* store the new information */
+        for(i = 0; i < nelmts; i++)
+            dsbufn[i] = dsbuf[i];
+
+        if((sid = H5Screate_simple(1, dims, NULL)) < 0)
+            goto out;
+
+        /* create the attribute again with the changes of space */
+        if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
+
+        /* write the new attribute with the new references */
+        if(H5Awrite(aid, tid, dsbufn) < 0)
+            goto out;
+
+        /* close space and attribute */
+        if(H5Sclose(sid) < 0)
+            goto out;
+        if(H5Aclose(aid) < 0)
+            goto out;
+    } /* nelmts */
+
+    /* close type */
+    if (H5Tclose(tid) < 0)
+        goto out;
+
+    if (dsbuf) 
+    {
+        free(dsbuf);
+        dsbuf=NULL;
+    }
+    if (dsbufn) 
+    {
+        free(dsbufn);
+        dsbufn=NULL;
+    }
+    if (dims) 
+    {
+        free(dims);
+        dims=NULL;
+    }
+
+
+    return SUCCEED;
+
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
-  H5Aclose(aid);
-  H5Tclose(tid);
-  if (dsbuf)
-   free(dsbuf);
-  if (dsbufn)
-   free(dsbufn);
-  if (dims)
-   free(dims);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+        
+        if (dsbuf) 
+        {
+            free(dsbuf);
+            dsbuf=NULL;
+        }
+        if (dsbufn) 
+        {
+            free(dsbufn);
+            dsbufn=NULL;
+        }
+        if (dims) 
+        {
+            free(dims);
+            dims=NULL;
+        }
+        if (buf) 
+        {
+            free(buf);
+            buf=NULL;
+        }
+    } H5E_END_TRY;
+    return FAIL;
 
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSis_attached
- *
- * Purpose: Report if dimension scale DSID is currently attached to
- *  dimension IDX of dataset DID by checking if DID has a pointer in the REFERENCE_LIST
- *  attribute and DSID (scale ) has a pointer in the DIMENSION_LIST attribute
- *
- * Return:
- *   1: both the DS and the dataset pointers match
- *   0: one of them or both do not match
- *   FAIL (-1): error
- *
- * Fails if: Bad arguments
- *           If DSID is not a Dimension Scale
- *           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: February 18, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSis_attached
+*
+* Purpose: Report if dimension scale DSID is currently attached to
+*  dimension IDX of dataset DID by checking if DID has a pointer in the REFERENCE_LIST
+*  attribute and DSID (scale ) has a pointer in the DIMENSION_LIST attribute
+*
+* Return:
+*   1: both the DS and the dataset pointers match
+*   0: one of them or both do not match
+*   FAIL (-1): error
+*
+* Fails if: Bad arguments
+*           If DSID is not a Dimension Scale
+*           If DID is a Dimension Scale (A Dimension Scale cannot have scales)
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: February 18, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 htri_t H5DSis_attached(hid_t did,
                        hid_t dsid,
                        unsigned int idx)
 {
- int        has_dimlist;
- int        has_reflist;
- hssize_t   nelmts;
- hid_t      sid;          /* space ID */
- hid_t      tid = -1;     /* attribute type ID */
- hid_t      aid = -1;     /* attribute ID */
- int        rank;         /* rank of dataset */
- ds_list_t  *dsbuf;       /* array of attribute data in the DS pointing to the dataset */
- hobj_ref_t ref;          /* reference to the DS */
- hvl_t      *buf;         /* VL buffer to store in the attribute */
- hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
+    int        has_dimlist;
+    int        has_reflist;
+    hssize_t   nelmts;
+    hid_t      sid;          /* space ID */
+    hid_t      tid = -1;     /* attribute type ID */
+    hid_t      aid = -1;     /* attribute ID */
+    int        rank;         /* rank of dataset */
+    ds_list_t  *dsbuf;       /* array of attribute data in the DS pointing to the dataset */
+    hobj_ref_t ref;          /* reference to the DS */
+    hvl_t      *buf;         /* VL buffer to store in the attribute */
+    hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
     hid_t      did_i;        /* dataset ID in REFERENCE_LIST */
- H5O_info_t oi1, oi2, oi3, oi4;
- H5I_type_t it1, it2;
- int        i;
- int        found_dset=0, found_ds=0;
+    H5O_info_t oi1, oi2, oi3, oi4;
+    H5I_type_t it1, it2;
+    int        i;
+    int        found_dset=0, found_ds=0;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* the dataset cannot be a DS dataset */
- if ((H5DSis_scale(did))==1)
-  return FAIL;
-
- /* get info for the dataset in the parameter list */
- if(H5Oget_info(did, &oi1) < 0)
-  return FAIL;
-
- /* get info for the scale in the parameter list */
- if(H5Oget_info(dsid, &oi2) < 0)
-  return FAIL;
-
- /* same object, not valid */
- if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
-  return FAIL;
-
- /* get ID type */
- if ((it1 = H5Iget_type(did)) < 0)
-  return FAIL;
- if ((it2 = H5Iget_type(dsid)) < 0)
-  return FAIL;
-
- if (H5I_DATASET!=it1 || H5I_DATASET!=it2)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* the dataset cannot be a DS dataset */
+    if ((H5DSis_scale(did))==1)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * get space
- *-------------------------------------------------------------------------
- */
+    /* get info for the dataset in the parameter list */
+    if(H5Oget_info(did, &oi1) < 0)
+        return FAIL;
 
- /* get dataset space */
- if ((sid = H5Dget_space(did)) < 0)
-  return FAIL;
+    /* get info for the scale in the parameter list */
+    if(H5Oget_info(dsid, &oi2) < 0)
+        return FAIL;
 
- /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
+    /* same object, not valid */
+    if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
+        return FAIL;
 
- /* close dataset space */
- if (H5Sclose(sid) < 0)
-  goto out;
+    /* get ID type */
+    if ((it1 = H5Iget_type(did)) < 0)
+        return FAIL;
+    if ((it2 = H5Iget_type(dsid)) < 0)
+        return FAIL;
 
- /* parameter range checking */
- if(idx > ((unsigned)rank - 1))
-  goto out;
+    if (H5I_DATASET!=it1 || H5I_DATASET!=it2)
+        return FAIL;
 
- /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
- if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * get space
+    *-------------------------------------------------------------------------
+    */
 
-/*-------------------------------------------------------------------------
- * open "DIMENSION_LIST"
- *-------------------------------------------------------------------------
- */
+    /* get dataset space */
+    if ((sid = H5Dget_space(did)) < 0)
+        return FAIL;
+
+    /* get rank */
+    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
+
+    /* close dataset space */
+    if (H5Sclose(sid) < 0)
+        goto out;
 
- if(has_dimlist == 1)
- {
-  if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
-   goto out;
+    /* parameter range checking */
+    if(idx > ((unsigned)rank - 1))
+        goto out;
 
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
+    /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
+    if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
+        return FAIL;
 
-  if((sid = H5Aget_space(aid)) < 0)
-   goto out;
+    /*-------------------------------------------------------------------------
+    * open "DIMENSION_LIST"
+    *-------------------------------------------------------------------------
+    */
 
-  /* allocate and initialize the VL */
-  buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
+    if(has_dimlist == 1)
+    {
+        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+            goto out;
 
-  if(buf == NULL)
-   goto out;
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
 
-  /* read */
-  if (H5Aread(aid,tid,buf) < 0)
-   goto out;
+        if((sid = H5Aget_space(aid)) < 0)
+            goto out;
 
-  /* iterate all the REFs in this dimension IDX */
-  for (i=0; i<(int)buf[idx].len; i++)
-  {
-   /* get the reference */
-   ref = ((hobj_ref_t *)buf[idx].p)[i];
+        /* allocate and initialize the VL */
+        buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
 
-   /* get the scale id for this REF */
-   if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
-    goto out;
+        if(buf == NULL)
+            goto out;
 
-   /* get info for DS in the parameter list */
-   if(H5Oget_info(dsid, &oi1) < 0)
-    goto out;
+        /* read */
+        if (H5Aread(aid,tid,buf) < 0)
+            goto out;
 
-   /* get info for this DS */
-   if(H5Oget_info(dsid_j, &oi2) < 0)
-    goto out;
+        /* iterate all the REFs in this dimension IDX */
+        for (i=0; i<(int)buf[idx].len; i++)
+        {
+            /* get the reference */
+            ref = ((hobj_ref_t *)buf[idx].p)[i];
 
-   /* same object */
-   if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
-    found_ds = 1;
+            /* get the scale id for this REF */
+            if ((dsid_j = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
+                goto out;
 
-   /* close the dereferenced dataset */
-   if (H5Dclose(dsid_j) < 0)
-    goto out;
+            /* get info for DS in the parameter list */
+            if(H5Oget_info(dsid, &oi1) < 0)
+                goto out;
 
-  }
+            /* get info for this DS */
+            if(H5Oget_info(dsid_j, &oi2) < 0)
+                goto out;
 
+            /* same object */
+            if(oi1.fileno == oi2.fileno && oi1.addr == oi2.addr)
+                found_ds = 1;
 
-  /* close */
-  if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
-   goto out;
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Tclose(tid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
-  if (buf)
-   free(buf);
- } /* has_dimlist */
+            /* close the dereferenced dataset */
+            if (H5Dclose(dsid_j) < 0)
+                goto out;
 
-/*-------------------------------------------------------------------------
- * info on the >>DS<< dataset
- *-------------------------------------------------------------------------
- */
+        }
 
- /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
- if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
-  goto out;
 
-/*-------------------------------------------------------------------------
- * open "REFERENCE_LIST"
- *-------------------------------------------------------------------------
- */
+        /* close */
+        if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+            goto out;
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
+        if (buf)
+        {
+            free(buf);
+            buf = NULL;
+        }
+    } /* has_dimlist */
 
- if(has_reflist ==  1)
- {
-  if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
-   goto out;
+    /*-------------------------------------------------------------------------
+    * info on the >>DS<< dataset
+    *-------------------------------------------------------------------------
+    */
 
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
+    /* try to find the attribute "REFERENCE_LIST" on the >>DS<< dataset */
+    if((has_reflist = H5LT_find_attribute(dsid, REFERENCE_LIST)) < 0)
+        goto out;
 
-  /* get and save the old reference(s) */
-  if((sid = H5Aget_space(aid)) < 0)
-   goto out;
+    /*-------------------------------------------------------------------------
+    * open "REFERENCE_LIST"
+    *-------------------------------------------------------------------------
+    */
 
-  if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
-   goto out;
+    if(has_reflist ==  1)
+    {
+        if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0)
+            goto out;
 
-  dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
 
-  if (dsbuf == NULL)
-   goto out;
+        /* get and save the old reference(s) */
+        if((sid = H5Aget_space(aid)) < 0)
+            goto out;
 
-  if (H5Aread(aid,tid,dsbuf) < 0)
-   goto out;
+        if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+            goto out;
 
-/*-------------------------------------------------------------------------
- * iterate
- *-------------------------------------------------------------------------
- */
-
-  for(i=0; i<nelmts; i++)
-  {
-   /* get the reference */
-   ref = dsbuf[i].ref;
-
-   /* the reference was not deleted  */
-   if (ref)
-   {
-    /* get the dataset id */
-    if ((did_i = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
-     goto out;
-
-    /* get info for dataset in the parameter list */
-    if(H5Oget_info(did, &oi3) < 0)
-     goto out;
-
-    /* get info for this dataset */
-    if(H5Oget_info(did_i, &oi4) < 0)
-     goto out;
-
-    /* same object */
-    if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && (int)idx==dsbuf[i].dim_idx)
-     found_dset=1;
-
-    /* close the dereferenced dataset */
-    if (H5Dclose(did_i) < 0)
-     goto out;
-   } /* if */
-  } /* i */
-
-
-  /* close */
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Tclose(tid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
-  if (dsbuf)
-   free(dsbuf);
- } /* has_reflist */
-
- if (found_ds && found_dset)
-  return 1;
- else
-  return 0;
-
-/* error zone, gracefully close */
+        dsbuf = malloc((size_t)nelmts * sizeof(ds_list_t));
+
+        if (dsbuf == NULL)
+            goto out;
+
+        if (H5Aread(aid,tid,dsbuf) < 0)
+            goto out;
+
+        /*-------------------------------------------------------------------------
+        * iterate
+        *-------------------------------------------------------------------------
+        */
+
+        for(i=0; i<nelmts; i++)
+        {
+            /* get the reference */
+            ref = dsbuf[i].ref;
+
+            /* the reference was not deleted  */
+            if (ref)
+            {
+                /* get the dataset id */
+                if ((did_i = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
+                    goto out;
+
+                /* get info for dataset in the parameter list */
+                if(H5Oget_info(did, &oi3) < 0)
+                    goto out;
+
+                /* get info for this dataset */
+                if(H5Oget_info(did_i, &oi4) < 0)
+                    goto out;
+
+                /* same object */
+                if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && (int)idx==dsbuf[i].dim_idx)
+                    found_dset=1;
+
+                /* close the dereferenced dataset */
+                if (H5Dclose(did_i) < 0)
+                    goto out;
+            } /* if */
+        } /* i */
+
+
+        /* close */
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
+        if (dsbuf)
+        {
+            free(dsbuf);
+            dsbuf = NULL;
+        }
+    } /* has_reflist */
+
+    if (found_ds && found_dset)
+        return 1;
+    else
+        return 0;
+
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
-  H5Aclose(aid);
-  H5Tclose(tid);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+
+    if (buf)
+    {
+        free(buf);
+        buf = NULL;
+    }
+    if (dsbuf)
+    {
+        free(dsbuf);
+        dsbuf = NULL;
+    }
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSiterate_scales
- *
- * Purpose: H5DSiterate_scales iterates over the scales attached to dimension DIM
- *  of dataset DID. For each scale in the list, the visitor_data and some
- *  additional information, specified below, are passed to the visitor function.
- *  The iteration begins with the IDX object in the group and the next element
- *  to be processed by the operator is returned in IDX. If IDX is NULL, then the
- *  iterator starts at zero.
- *
- * Parameters:
- *
- *  hid_t DID;               IN: the dataset
- *  unsigned int dim;        IN: the dimension of the dataset
- *  int *idx;                IN/OUT: input the index to start iterating, output the
- *                             next index to visit. If NULL, start at the first position.
- *  H5DS_iterate_t visitor;  IN: the visitor function
- *  void *visitor_data;      IN: arbitrary data to pass to the visitor function.
- *
- *  Iterate over all scales of DIM, calling an application callback
- *   with the item, key and any operator data.
- *
- *   The operator callback receives a pointer to the item ,
- *   and the pointer to the operator data passed
- *   in to H5SL_iterate ('op_data').  The return values from an operator are:
- *       A. Zero causes the iterator to continue, returning zero when all
- *           nodes of that type have been processed.
- *       B. Positive causes the iterator to immediately return that positive
- *           value, indicating short-circuit success.
- *       C. Negative causes the iterator to immediately return that value,
- *           indicating failure.
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 31, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSiterate_scales
+*
+* Purpose: H5DSiterate_scales iterates over the scales attached to dimension DIM
+*  of dataset DID. For each scale in the list, the visitor_data and some
+*  additional information, specified below, are passed to the visitor function.
+*  The iteration begins with the IDX object in the group and the next element
+*  to be processed by the operator is returned in IDX. If IDX is NULL, then the
+*  iterator starts at zero.
+*
+* Parameters:
+*
+*  hid_t DID;               IN: the dataset
+*  unsigned int dim;        IN: the dimension of the dataset
+*  int *idx;                IN/OUT: input the index to start iterating, output the
+*                             next index to visit. If NULL, start at the first position.
+*  H5DS_iterate_t visitor;  IN: the visitor function
+*  void *visitor_data;      IN: arbitrary data to pass to the visitor function.
+*
+*  Iterate over all scales of DIM, calling an application callback
+*   with the item, key and any operator data.
+*
+*   The operator callback receives a pointer to the item ,
+*   and the pointer to the operator data passed
+*   in to H5SL_iterate ('op_data').  The return values from an operator are:
+*       A. Zero causes the iterator to continue, returning zero when all
+*           nodes of that type have been processed.
+*       B. Positive causes the iterator to immediately return that positive
+*           value, indicating short-circuit success.
+*       C. Negative causes the iterator to immediately return that value,
+*           indicating failure.
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 31, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 herr_t H5DSiterate_scales(hid_t did,
                           unsigned int dim,
@@ -1228,162 +1302,165 @@ herr_t H5DSiterate_scales(hid_t did,
                           H5DS_iterate_t visitor,
                           void *visitor_data )
 {
- hid_t        scale_id;
- int          rank;
- hobj_ref_t   ref;          /* reference to the DS */
- hid_t        sid;          /* space ID */
- hid_t        tid = -1;     /* attribute type ID */
- hid_t        aid = -1;     /* attribute ID */
- hvl_t        *buf=NULL;    /* VL buffer to store in the attribute */
- H5I_type_t   it;           /* ID type */
- herr_t       ret_value=0;
- int          j_idx;
- int          nscales;
- int          has_dimlist;
- int          i;
+    hid_t        scale_id;
+    int          rank;
+    hobj_ref_t   ref;          /* reference to the DS */
+    hid_t        sid;          /* space ID */
+    hid_t        tid = -1;     /* attribute type ID */
+    hid_t        aid = -1;     /* attribute ID */
+    hvl_t        *buf=NULL;    /* VL buffer to store in the attribute */
+    H5I_type_t   it;           /* ID type */
+    herr_t       ret_value=0;
+    int          j_idx;
+    int          nscales;
+    int          has_dimlist;
+    int          i;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* get ID type */
- if ((it = H5Iget_type(did)) < 0)
-  return FAIL;
-
- if (H5I_DATASET!=it)
-  return FAIL;
-
- /* get the number of scales assotiated with this DIM */
- if ((nscales = H5DSget_num_scales(did,dim)) < 0)
-  return FAIL;
-
- /* get dataset space */
- if ((sid = H5Dget_space(did)) < 0)
-  return FAIL;
-
- /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
-
- /* close dataset space */
- if(H5Sclose(sid) < 0)
-  goto out;
-
- /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
- if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
-  return FAIL;
-
- if(has_dimlist == 0)
-  return SUCCEED;
-
- else if(has_dimlist == 1)
- {
-  if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
-   goto out;
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
-  if((sid = H5Aget_space(aid)) < 0)
-   goto out;
-
-  /* allocate and initialize the VL */
-  buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
-
-  if(buf == NULL)
-   goto out;
-
-  /* read */
-  if(H5Aread(aid, tid, buf) < 0)
-   goto out;
-
-  if ( buf[dim].len > 0 )
-  {
-   if (idx!=NULL)
-    j_idx = *idx;
-   else
-    j_idx=0;
-
-   /* iterate */
-   for(i=j_idx; i<nscales; i++)
-   {
-    /* get the reference */
-    ref = ((hobj_ref_t *)buf[dim].p)[ i ];
-
-    /* disable error reporting, the ID might refer to a deleted dataset */
-    H5E_BEGIN_TRY {
-     /* get the DS id */
-     if ((scale_id = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
-      goto out;
-    } H5E_END_TRY;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* get ID type */
+    if ((it = H5Iget_type(did)) < 0)
+        return FAIL;
+
+    if (H5I_DATASET!=it)
+        return FAIL;
+
+    /* get the number of scales assotiated with this DIM */
+    if ((nscales = H5DSget_num_scales(did,dim)) < 0)
+        return FAIL;
+
+    /* get dataset space */
+    if ((sid = H5Dget_space(did)) < 0)
+        return FAIL;
+
+    /* get rank */
+    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
 
-    if((ret_value=(visitor)(did,dim,scale_id,visitor_data))!=0)
+    /* close dataset space */
+    if(H5Sclose(sid) < 0)
+        goto out;
+
+    /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
+    if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
+        return FAIL;
+
+    if(has_dimlist == 0)
+        return SUCCEED;
+
+    else if(has_dimlist == 1)
     {
-     /* set the return IDX OUT value at current scale index and break */
-     if (idx!=NULL)
-     {
-      *idx = i;
-     }
+        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+            goto out;
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
+        if((sid = H5Aget_space(aid)) < 0)
+            goto out;
 
-     /* close the DS id */
-     if (H5Dclose(scale_id) < 0)
-      goto out;
+        /* allocate and initialize the VL */
+        buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
 
-     break;
-    }
+        if(buf == NULL)
+            goto out;
 
-    /* close the DS id */
-    if (H5Dclose(scale_id) < 0)
-     goto out;
+        /* read */
+        if(H5Aread(aid, tid, buf) < 0)
+            goto out;
 
-   } /* i */
-  } /* if */
+        if ( buf[dim].len > 0 )
+        {
+            if (idx!=NULL)
+                j_idx = *idx;
+            else
+                j_idx=0;
+
+            /* iterate */
+            for(i=j_idx; i<nscales; i++)
+            {
+                /* get the reference */
+                ref = ((hobj_ref_t *)buf[dim].p)[ i ];
+
+                /* disable error reporting, the ID might refer to a deleted dataset */
+                H5E_BEGIN_TRY {
+                    /* get the DS id */
+                    if ((scale_id = H5Rdereference(did,H5R_OBJECT,&ref)) < 0)
+                        goto out;
+                } H5E_END_TRY;
+
+                if((ret_value=(visitor)(did,dim,scale_id,visitor_data))!=0)
+                {
+                    /* set the return IDX OUT value at current scale index and break */
+                    if (idx!=NULL)
+                    {
+                        *idx = i;
+                    }
+
+                    /* close the DS id */
+                    if (H5Dclose(scale_id) < 0)
+                        goto out;
+
+                    break;
+                }
+
+                /* close the DS id */
+                if (H5Dclose(scale_id) < 0)
+                    goto out;
+
+            } /* i */
+        } /* if */
 
-  /* close */
-  if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
-   goto out;
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Tclose(tid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
-  if (buf)
-   free(buf);
+        /* close */
+        if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+            goto out;
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
+        if (buf)
+        {
+            free(buf);
+            buf = NULL;
+        }
 
- } /* if has_dimlist */
+    } /* if has_dimlist */
 
- return ret_value;
+    return ret_value;
 
 out:
- H5E_BEGIN_TRY {
-  if (buf)
-  {
-   H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf);
-   free(buf);
-  }
-  H5Sclose(sid);
-  H5Aclose(aid);
-  H5Tclose(tid);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        if (buf)
+        {
+            H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf);
+            free(buf);
+        }
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSset_label
- *
- * Purpose: Set label for the dimension IDX of dataset DID to the value LABEL
- *
- * Return: Success: SUCCEED, Failure: FAIL
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 11, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSset_label
+*
+* Purpose: Set label for the dimension IDX of dataset DID to the value LABEL
+*
+* Return: Success: SUCCEED, Failure: FAIL
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 11, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
     int has_labels;
@@ -1397,9 +1474,9 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
     unsigned int i;
 
     /*-------------------------------------------------------------------------
-     * parameter checking
-     *-------------------------------------------------------------------------
-     */
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
@@ -1408,9 +1485,9 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
         return FAIL;
 
     /*-------------------------------------------------------------------------
-     * attribute "DIMENSION_LABELS"
-     *-------------------------------------------------------------------------
-     */
+    * attribute "DIMENSION_LABELS"
+    *-------------------------------------------------------------------------
+    */
 
     /* try to find the attribute "DIMENSION_LABELS" on the >>data<< dataset */
     if ((has_labels = H5LT_find_attribute(did, DIMENSION_LABELS)) < 0)
@@ -1429,9 +1506,9 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
         goto out;
 
     /*-------------------------------------------------------------------------
-     * make the attribute and insert label
-     *-------------------------------------------------------------------------
-     */
+    * make the attribute and insert label
+    *-------------------------------------------------------------------------
+    */
 
     if (has_labels == 0) {
         dims[0] = rank;
@@ -1448,7 +1525,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
 
         /* create the attribute */
         if ((aid = H5Acreate2(did, DIMENSION_LABELS, tid, sid,
-                H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
 
         /* allocate and initialize */
@@ -1475,13 +1552,16 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
         if (H5Aclose(aid) < 0)
             goto out;
         if (buf)
+        {
             free((void *) buf);
+            buf = NULL;
+        }
     }
 
     /*-------------------------------------------------------------------------
-     * just insert label
-     *-------------------------------------------------------------------------
-     */
+    * just insert label
+    *-------------------------------------------------------------------------
+    */
 
     else {
         if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0)
@@ -1526,13 +1606,16 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
         if (H5Aclose(aid) < 0)
             goto out;
         if (buf)
+        {
             free((void *) buf);
+            buf = NULL;
+        }
     }
 
     return SUCCEED;
 
-    /* error zone, gracefully close */
-    out: 
+    /* error zone */
+out: 
     if (buf) {
         if (buf[idx]) /* check if we errored during H5Awrite */
             buf[idx] = NULL; /* don't free label */
@@ -1544,35 +1627,35 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) {
         free(buf);
     }
     H5E_BEGIN_TRY
-        {
-            H5Sclose(sid);
-            H5Aclose(aid);
-            H5Tclose(tid);
-        }H5E_END_TRY;
+    {
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+    }H5E_END_TRY;
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSget_label
- *
- * Purpose: Read the label LABEL for dimension IDX of dataset DID
- *   Up to 'size' characters are stored in 'label' followed by a '\0' string
- *   terminator.  If the label is longer than 'size'-1,
- *   the string terminator is stored in the last position of the buffer to
- *   properly terminate the string.
- *
- * Return: 0 if no label found, size of label if found, Failure: FAIL
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 11, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSget_label
+*
+* Purpose: Read the label LABEL for dimension IDX of dataset DID
+*   Up to 'size' characters are stored in 'label' followed by a '\0' string
+*   terminator.  If the label is longer than 'size'-1,
+*   the string terminator is stored in the last position of the buffer to
+*   properly terminate the string.
+*
+* Return: 0 if no label found, size of label if found, Failure: FAIL
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 11, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) {
     int has_labels;
     hid_t sid; /* space ID */
@@ -1586,9 +1669,9 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) {
     int i;
 
     /*-------------------------------------------------------------------------
-     * parameter checking
-     *-------------------------------------------------------------------------
-     */
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
     /* get ID type */
     if ((it = H5Iget_type(did)) < 0)
         return FAIL;
@@ -1597,20 +1680,19 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) {
         return FAIL;
 
     /*-------------------------------------------------------------------------
-     * attribute "DIMENSION_LABELS"
-     *-------------------------------------------------------------------------
-     */
+    * attribute "DIMENSION_LABELS"
+    *-------------------------------------------------------------------------
+    */
 
     /* try to find the attribute "DIMENSION_LABELS" on the >>data<< dataset */
     if ((has_labels = H5LT_find_attribute(did, DIMENSION_LABELS)) < 0)
         return FAIL;
 
     /* return 0 and NULL for label if no label found */
-    if (has_labels == 0) {
+    if (has_labels == 0) 
+    {
         if (label)
-/*            label = NULL;
- */
-        label[0] = 0;
+            label[0] = 0;
         return 0;
     }
 
@@ -1627,9 +1709,9 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) {
         goto out;
 
     /*-------------------------------------------------------------------------
-     * open the attribute and read label
-     *-------------------------------------------------------------------------
-     */
+    * open the attribute and read label
+    *-------------------------------------------------------------------------
+    */
 
     assert (has_labels == 1);
     if ((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0)
@@ -1674,12 +1756,15 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) {
     if (H5Aclose(aid) < 0)
         goto out;
     if (buf)
+    {
         free(buf);
+        buf = NULL;
+    }
 
     return (ssize_t) nbytes;
 
-    /* error zone, gracefully close */
-    out: 
+    /* error zone */
+out: 
     if (buf) {
         /* free all the ptr's from the H5Aread() */
         for (i = 0; i < (unsigned int) rank; i++) {
@@ -1689,411 +1774,423 @@ ssize_t H5DSget_label(hid_t did, unsigned int idx, char *label, size_t size) {
         free(buf);
     }
     H5E_BEGIN_TRY
-        {
-            H5Sclose(sid);
-            H5Aclose(aid);
-            H5Tclose(tid);
-        }H5E_END_TRY;
+    {
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+    }H5E_END_TRY;
     return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSget_scale_name
- *
- * Purpose: Read the name of dataset scale DID into buffer NAME
- *   Up to 'size' characters are stored in 'name' followed by a '\0' string
- *   terminator.  If the name is longer than 'size'-1,
- *   the string terminator is stored in the last position of the buffer to
- *   properly terminate the string.
- *
- * Return: size of name if found, zero if not found,  Failure: FAIL
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 04, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSget_scale_name
+*
+* Purpose: Read the name of dataset scale DID into buffer NAME
+*   Up to 'size' characters are stored in 'name' followed by a '\0' string
+*   terminator.  If the name is longer than 'size'-1,
+*   the string terminator is stored in the last position of the buffer to
+*   properly terminate the string.
+*
+* Return: size of name if found, zero if not found,  Failure: FAIL
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 04, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 ssize_t H5DSget_scale_name(hid_t did,
                            char *name,
                            size_t size)
 {
- hid_t      aid;      /* attribute ID  */
- hid_t      tid = -1; /* attribute type ID */
- hid_t      sid;      /* space ID  */
- H5I_type_t it;       /* ID type */
- size_t     nbytes;
- size_t     copy_len;
- int        has_name;
- char       *buf=NULL;
+    hid_t      aid;      /* attribute ID  */
+    hid_t      tid = -1; /* attribute type ID */
+    hid_t      sid;      /* space ID  */
+    H5I_type_t it;       /* ID type */
+    size_t     nbytes;
+    size_t     copy_len;
+    int        has_name;
+    char       *buf=NULL;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* get ID type */
- if ((it = H5Iget_type(did)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* get ID type */
+    if ((it = H5Iget_type(did)) < 0)
+        return FAIL;
 
- if (H5I_DATASET!=it)
-  return FAIL;
+    if (H5I_DATASET!=it)
+        return FAIL;
 
- if ((H5DSis_scale(did))<=0)
-  return FAIL;
+    if ((H5DSis_scale(did))<=0)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * check if the DS has a name
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * check if the DS has a name
+    *-------------------------------------------------------------------------
+    */
+
+    /* try to find the attribute "NAME" on the >>DS<< dataset */
+    if ((has_name = H5LT_find_attribute(did, "NAME")) < 0)
+        return FAIL;
 
- /* try to find the attribute "NAME" on the >>DS<< dataset */
- if((has_name = H5LT_find_attribute(did, "NAME")) < 0)
-  return FAIL;
+    if (has_name == 0)
+        return 0;
 
- if(has_name == 0)
-  return 0;
+    /*-------------------------------------------------------------------------
+    * open the attribute
+    *-------------------------------------------------------------------------
+    */
 
-/*-------------------------------------------------------------------------
- * open the attribute
- *-------------------------------------------------------------------------
- */
-
- if((aid = H5Aopen(did, "NAME", H5P_DEFAULT)) < 0)
-  return FAIL;
-
- /* get space */
- if((sid = H5Aget_space(aid)) < 0)
-  goto out;
-
- /* get type */
- if((tid = H5Aget_type(aid)) < 0)
-  goto out;
-
- /* get the size */
- if((nbytes = H5Tget_size(tid)) == 0)
-  goto out;
-
- /* allocate a temporary buffer */
- buf = (char*)malloc(nbytes * sizeof(char));
- if (buf == NULL)
-  goto out;
-
- /* read */
- if (H5Aread(aid,tid,buf) < 0)
-  goto out;
-
- /* compute the string length which will fit into the user's buffer */
- copy_len = MIN(size-1, nbytes);
-
- /* copy all/some of the name */
- if (name) {
-  memcpy(name, buf, copy_len);
-
-  /* terminate the string */
-  name[copy_len]='\0';
- }
-
- /* close */
- if (H5Tclose(tid) < 0)
-  goto out;
- if (H5Aclose(aid) < 0)
-  goto out;
- if (H5Sclose(sid) < 0)
-  goto out;
- if (buf)
- {
-  free(buf);
-  buf=NULL;
- }
-
- return (ssize_t) nbytes;
-
- /* error zone, gracefully close */
+    if((aid = H5Aopen(did, "NAME", H5P_DEFAULT)) < 0)
+        return FAIL;
+
+    /* get space */
+    if((sid = H5Aget_space(aid)) < 0)
+        goto out;
+
+    /* get type */
+    if((tid = H5Aget_type(aid)) < 0)
+        goto out;
+
+    /* get the size */
+    if((nbytes = H5Tget_size(tid)) == 0)
+        goto out;
+
+    /* allocate a temporary buffer */
+    buf = (char*)malloc(nbytes * sizeof(char));
+    if (buf == NULL)
+        goto out;
+
+    /* read */
+    if (H5Aread(aid,tid,buf) < 0)
+        goto out;
+
+    /* compute the string length which will fit into the user's buffer */
+    copy_len = MIN(size-1, nbytes);
+
+    /* copy all/some of the name */
+    if (name) {
+        memcpy(name, buf, copy_len);
+
+        /* terminate the string */
+        name[copy_len]='\0';
+    }
+
+    /* close */
+    if (H5Tclose(tid) < 0)
+        goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
+    if (H5Sclose(sid) < 0)
+        goto out;
+    if (buf)
+    {
+        free(buf);
+        buf=NULL;
+    }
+
+    return (ssize_t) nbytes;
+
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Aclose(aid);
-  H5Tclose(tid);
-  H5Sclose(sid);
- } H5E_END_TRY;
- if (buf)
-  free(buf);
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Aclose(aid);
+        H5Tclose(tid);
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    if (buf)
+    {
+        free(buf);
+        buf=NULL;
+    }
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSis_scale
- *
- * Purpose: check if the dataset DID is a dimension scale
- *
- * Return: 1, is, 0, not, FAIL, error
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 04, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSis_scale
+*
+* Purpose: check if the dataset DID is a dimension scale
+*
+* Return: 1, is, 0, not, FAIL, error
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 04, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 htri_t H5DSis_scale(hid_t did)
 {
- hid_t      tid = -1;   /* attribute type ID */
- hid_t      aid;        /* attribute ID */
- herr_t     has_class;  /* has the "CLASS" attribute */
- htri_t     is_ds;      /* boolean return value */
- H5I_type_t it;           /* ID type */
- char       buf[20];
+    hid_t      tid = -1;   /* attribute type ID */
+    hid_t      aid;        /* attribute ID */
+    herr_t     has_class;  /* has the "CLASS" attribute */
+    htri_t     is_ds;      /* boolean return value */
+    H5I_type_t it;           /* ID type */
+    char       buf[20];
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* get ID type */
- if ((it = H5Iget_type(did)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* get ID type */
+    if ((it = H5Iget_type(did)) < 0)
+        return FAIL;
 
- if(H5I_DATASET != it)
-  return FAIL;
+    if(H5I_DATASET != it)
+        return FAIL;
 
- /* try to find the attribute "CLASS" on the dataset */
- if((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
-  return FAIL;
+    /* try to find the attribute "CLASS" on the dataset */
+    if((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
+        return FAIL;
 
- if(has_class == 0)
-  is_ds = 0;
+    if(has_class == 0)
+        is_ds = 0;
 
- else
- {
-  if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
-   goto out;
+    else
+    {
+        if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
+            goto out;
 
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
 
-  if(H5Aread(aid, tid, buf) < 0)
-   goto out;
+        if(H5Aread(aid, tid, buf) < 0)
+            goto out;
 
-  if(strcmp(buf, DIMENSION_SCALE_CLASS)==0)
-   is_ds = 1;
-  else
-   is_ds = 0;
+        if(strcmp(buf, DIMENSION_SCALE_CLASS)==0)
+            is_ds = 1;
+        else
+            is_ds = 0;
 
-  if(H5Tclose(tid) < 0)
-   goto out;
+        if(H5Tclose(tid) < 0)
+            goto out;
 
-  if (H5Aclose(aid) < 0)
-   goto out;
- }
+        if (H5Aclose(aid) < 0)
+            goto out;
+    }
 
- return is_ds;
+    return is_ds;
 
-/* error zone, gracefully close */
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Aclose(aid);
-  H5Tclose(tid);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Aclose(aid);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+    return FAIL;
 
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DSget_num_scales
- *
- * Purpose: get the number of scales linked to the IDX dimension of dataset DID
- *
- * Return:
- *   Success: number of scales
- *   Failure: FAIL
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: January 13, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DSget_num_scales
+*
+* Purpose: get the number of scales linked to the IDX dimension of dataset DID
+*
+* Return:
+*   Success: number of scales
+*   Failure: FAIL
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: January 13, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 int H5DSget_num_scales(hid_t did,
                        unsigned int idx)
 {
- int        has_dimlist;
- hid_t      sid;          /* space ID */
- hid_t      tid = -1;     /* attribute type ID */
- hid_t      aid = -1;     /* attribute ID */
- int        rank;         /* rank of dataset */
- hvl_t      *buf;         /* VL buffer to store in the attribute */
- H5I_type_t it;           /* ID type */
- int        nscales;
+    int        has_dimlist;
+    hid_t      sid;          /* space ID */
+    hid_t      tid = -1;     /* attribute type ID */
+    hid_t      aid = -1;     /* attribute ID */
+    int        rank;         /* rank of dataset */
+    hvl_t      *buf;         /* VL buffer to store in the attribute */
+    H5I_type_t it;           /* ID type */
+    int        nscales;
 
-/*-------------------------------------------------------------------------
- * parameter checking
- *-------------------------------------------------------------------------
- */
- /* get ID type */
- if ((it = H5Iget_type(did)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * parameter checking
+    *-------------------------------------------------------------------------
+    */
+    /* get ID type */
+    if ((it = H5Iget_type(did)) < 0)
+        return FAIL;
 
- if (H5I_DATASET!=it)
-  return FAIL;
+    if (H5I_DATASET!=it)
+        return FAIL;
 
-/*-------------------------------------------------------------------------
- * the attribute "DIMENSION_LIST" on the >>data<< dataset must exist
- *-------------------------------------------------------------------------
- */
- /* get dataset space */
- if ((sid = H5Dget_space(did)) < 0)
-  return FAIL;
+    /*-------------------------------------------------------------------------
+    * the attribute "DIMENSION_LIST" on the >>data<< dataset must exist
+    *-------------------------------------------------------------------------
+    */
+    /* get dataset space */
+    if ((sid = H5Dget_space(did)) < 0)
+        return FAIL;
 
- /* get rank */
- if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
+    /* get rank */
+    if ((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
 
- /* close dataset space */
- if (H5Sclose(sid) < 0)
-  goto out;
+    /* close dataset space */
+    if (H5Sclose(sid) < 0)
+        goto out;
 
- /* dimemsion index IDX range checking */
- if (idx>=(unsigned int )rank)
-  return FAIL;
+    /* dimemsion index IDX range checking */
+    if (idx>=(unsigned int )rank)
+        return FAIL;
 
- /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
- if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
-  return FAIL;
+    /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
+    if((has_dimlist = H5LT_find_attribute(did, DIMENSION_LIST)) < 0)
+        return FAIL;
 
- /* it does not exist */
- if(has_dimlist == 0)
-  return 0;
+    /* it does not exist */
+    if(has_dimlist == 0)
+        return 0;
 
-/*-------------------------------------------------------------------------
- * the attribute exists, open it
- *-------------------------------------------------------------------------
- */
-
- else
- {
-  if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
-   goto out;
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
-  if((sid = H5Aget_space(aid)) < 0)
-   goto out;
-
-  /* allocate and initialize the VL */
-  buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
-
-  if(buf == NULL)
-   goto out;
-
-  /* read */
-  if(H5Aread(aid, tid, buf) < 0)
-   goto out;
-
-  nscales=(int)buf[idx].len;
-
-  /* close */
-  if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
-   goto out;
-  if (H5Sclose(sid) < 0)
-   goto out;
-  if (H5Tclose(tid) < 0)
-   goto out;
-  if (H5Aclose(aid) < 0)
-   goto out;
-  if (buf)
-   free(buf);
-
- } /* has_dimlist */
-
- return nscales;
-
-/* error zone, gracefully close */
+    /*-------------------------------------------------------------------------
+    * the attribute exists, open it
+    *-------------------------------------------------------------------------
+    */
+
+    else
+    {
+        if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0)
+            goto out;
+        if((tid = H5Aget_type(aid)) < 0)
+            goto out;
+        if((sid = H5Aget_space(aid)) < 0)
+            goto out;
+
+        /* allocate and initialize the VL */
+        buf = (hvl_t*)malloc((size_t)rank * sizeof(hvl_t));
+
+        if(buf == NULL)
+            goto out;
+
+        /* read */
+        if(H5Aread(aid, tid, buf) < 0)
+            goto out;
+
+        nscales=(int)buf[idx].len;
+
+        /* close */
+        if (H5Dvlen_reclaim(tid,sid,H5P_DEFAULT,buf) < 0)
+            goto out;
+        if (H5Sclose(sid) < 0)
+            goto out;
+        if (H5Tclose(tid) < 0)
+            goto out;
+        if (H5Aclose(aid) < 0)
+            goto out;
+        if (buf)
+        {
+            free(buf);
+            buf = NULL;
+        }
+
+    } /* has_dimlist */
+
+    return nscales;
+
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
-  H5Aclose(aid);
-  H5Tclose(tid);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Aclose(aid);
+        H5Tclose(tid);
+    } H5E_END_TRY;
+
+    if (buf)
+    {
+        free(buf);
+        buf = NULL;
+    }
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function: H5DS_is_reserved
- *
- * Purpose: Verify that a dataset's CLASS is either an image, palette or table
- *
- * Return: true, false, fail
- *
- * Programmer: pvn@ncsa.uiuc.edu
- *
- * Date: March 19, 2005
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
+* Function: H5DS_is_reserved
+*
+* Purpose: Verify that a dataset's CLASS is either an image, palette or table
+*
+* Return: true, false, fail
+*
+* Programmer: pvn@ncsa.uiuc.edu
+*
+* Date: March 19, 2005
+*
+* Comments:
+*
+* Modifications:
+*
+*-------------------------------------------------------------------------
+*/
 
 herr_t H5DS_is_reserved(hid_t did)
 {
- int    has_class;
- hid_t  tid = -1;
- hid_t  aid = -1;
- char   buf[40];
- herr_t ret;
+    int    has_class;
+    hid_t  tid = -1;
+    hid_t  aid = -1;
+    char   buf[40];
+    herr_t ret;
 
- /* try to find the attribute "CLASS" on the dataset */
- if((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
-  return -1;
+    /* try to find the attribute "CLASS" on the dataset */
+    if((has_class = H5LT_find_attribute(did, "CLASS")) < 0)
+        return -1;
 
- if(has_class ==  0)
-  return 0;
+    if(has_class ==  0)
+        return 0;
 
- assert(has_class ==  1);
-  if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
-   goto out;
+    assert(has_class ==  1);
+    if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0)
+        goto out;
 
-  if((tid = H5Aget_type(aid)) < 0)
-   goto out;
+    if((tid = H5Aget_type(aid)) < 0)
+        goto out;
 
-  if(H5Aread(aid, tid, buf) < 0)
-   goto out;
+    if(H5Aread(aid, tid, buf) < 0)
+        goto out;
 
-  if(strcmp(buf, IMAGE_CLASS) == 0 ||
-       strcmp(buf, PALETTE_CLASS) == 0 ||
-       strcmp(buf, TABLE_CLASS) == 0 )
-   ret = 1;
-  else
-   ret = 0;
+    if(strcmp(buf, IMAGE_CLASS) == 0 ||
+        strcmp(buf, PALETTE_CLASS) == 0 ||
+        strcmp(buf, TABLE_CLASS) == 0 )
+        ret = 1;
+    else
+        ret = 0;
 
-  if (H5Tclose(tid) < 0)
-   goto out;
+    if (H5Tclose(tid) < 0)
+        goto out;
 
-  if (H5Aclose(aid) < 0)
-   goto out;
+    if (H5Aclose(aid) < 0)
+        goto out;
 
 
- return ret;
+    return ret;
 
-/* error zone, gracefully close */
+    /* error zone */
 out:
- H5E_BEGIN_TRY {
-  H5Tclose(tid);
-  H5Aclose(aid);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Tclose(tid);
+        H5Aclose(aid);
+    } H5E_END_TRY;
+    return FAIL;
 }
 
 
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 8fb8604..e4d4260 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -76,22 +76,22 @@ static int read_data( const char* fname, int ndims, hsize_t *dims, float **buf )
  */
 int main(void)
 {
- int nerrors=0;
+    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;
+    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;
+    if(nerrors) goto error;
+    printf("All dimension scales tests passed.\n");
+    return 0;
 
 error:
- printf("***** %d DIMENSION SCALES TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
- return 1;
+    printf("***** %d DIMENSION SCALES TEST%s FAILED! *****\n",nerrors, 1 == nerrors ? "" : "S");
+    return 1;
 }
 
 
@@ -116,1332 +116,1332 @@ error:
 
 static int test_simple(void)
 {
- hid_t   fid;                                              /* file ID */
- hid_t   did = -1;                                         /* dataset ID */
- hid_t   dsid;                                             /* DS dataset ID */
- hid_t   sid;                                              /* space ID */
- hid_t   gid;                                              /* group ID */
- int     rank     = RANK;                                  /* rank of data dataset */
- int     rankds   = 1;                                     /* rank of DS dataset */
- hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
- int     buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
- hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
- hsize_t s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
- char    sname[30];                                        /* scale name buffer */
- char    dname[30];                                        /* dataset name */
- int     s1_wbuf[DIM1_SIZE] = {10,20,30};                  /* data of DS 1 dataset */
- int     s11_wbuf[DIM1_SIZE] = {10,100,300};               /* data of DS 1 dataset */
- int     s2_wbuf[DIM2_SIZE] = {100,200,300,400};           /* data of DS 2 dataset */
- int     s21_wbuf[DIM2_SIZE] = {10,20,30,40};              /* data of DS 2 dataset */
- int     s22_wbuf[DIM2_SIZE] = {5,10,50,300};              /* data of DS 2 dataset */
- char    dim0_label[16];                                   /* read label for DIM 0 */
- char    dim1_label[16];                                   /* read label for DIM 1 */
- char    *dim0_labeld;                                     /* read label for DIM 0 */
- char    *dim1_labeld;                                     /* read label for DIM 1 */
- char    dim0_labels[3];                                   /* read label for DIM 0 */
- char    dim1_labels[3];                                   /* read label for DIM 1 */
- ssize_t dim0_label_size;                                  /* lenght of label buffer */
- ssize_t dim1_label_size;                                  /* lenght of label buffer */
- unsigned int dim;                                         /* dataset dimension index */
- int     scale_idx;                                        /* scale index */
- int     nscales;                                          /* number of scales in DIM */
- ssize_t name_len;                                         /* lenght of name buffer */
- char    *name_out=NULL;                                   /* scale name buffer */
- char    snames[3];                                        /* scale name buffer */
- int     i, j;
-
-
- printf("Testing API functions\n");
+    hid_t   fid;                                              /* file ID */
+    hid_t   did = -1;                                         /* dataset ID */
+    hid_t   dsid;                                             /* DS dataset ID */
+    hid_t   sid;                                              /* space ID */
+    hid_t   gid;                                              /* group ID */
+    int     rank     = RANK;                                  /* rank of data dataset */
+    int     rankds   = 1;                                     /* rank of DS dataset */
+    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
+    int     buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
+    hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
+    hsize_t s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
+    char    sname[30];                                        /* scale name buffer */
+    char    dname[30];                                        /* dataset name */
+    int     s1_wbuf[DIM1_SIZE] = {10,20,30};                  /* data of DS 1 dataset */
+    int     s11_wbuf[DIM1_SIZE] = {10,100,300};               /* data of DS 1 dataset */
+    int     s2_wbuf[DIM2_SIZE] = {100,200,300,400};           /* data of DS 2 dataset */
+    int     s21_wbuf[DIM2_SIZE] = {10,20,30,40};              /* data of DS 2 dataset */
+    int     s22_wbuf[DIM2_SIZE] = {5,10,50,300};              /* data of DS 2 dataset */
+    char    dim0_label[16];                                   /* read label for DIM 0 */
+    char    dim1_label[16];                                   /* read label for DIM 1 */
+    char    *dim0_labeld;                                     /* read label for DIM 0 */
+    char    *dim1_labeld;                                     /* read label for DIM 1 */
+    char    dim0_labels[3];                                   /* read label for DIM 0 */
+    char    dim1_labels[3];                                   /* read label for DIM 1 */
+    ssize_t dim0_label_size;                                  /* lenght of label buffer */
+    ssize_t dim1_label_size;                                  /* lenght of label buffer */
+    unsigned int dim;                                         /* dataset dimension index */
+    int     scale_idx;                                        /* scale index */
+    int     nscales;                                          /* number of scales in DIM */
+    ssize_t name_len;                                         /* lenght of name buffer */
+    char    *name_out=NULL;                                   /* scale name buffer */
+    char    snames[3];                                        /* scale name buffer */
+    int     i, j;
+
+
+    printf("Testing API functions\n");
+
+    /*-------------------------------------------------------------------------
+    * create a file for the test
+    *-------------------------------------------------------------------------
+    */
+
+    /* create a file using default properties */
+    if((fid=H5Fcreate(FILE1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create datasets: 1 "data" dataset and 4 dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* make a dataset */
+    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)
+        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)
+        goto out;
+
+    /* make a DS dataset for the second dimension */
+    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)
+        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)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * test 1: attach scale
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach scales");
+
+    /* get the dataset id for "dset_a" */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach the DS_1_NAME dimension scale to "dset_a"
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the DS dataset id */
+    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)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach the DS_11_NAME dimension scale to "dset_a"
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the DS dataset id */
+    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)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach the DS_2_NAME dimension scale to "dset_a"
+    *-------------------------------------------------------------------------
+    */
 
-/*-------------------------------------------------------------------------
- * create a file for the test
- *-------------------------------------------------------------------------
- */
-
- /* create a file using default properties */
- if((fid=H5Fcreate(FILE1,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * create datasets: 1 "data" dataset and 4 dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* make a dataset */
- 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)
-  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)
-  goto out;
-
- /* make a DS dataset for the second dimension */
- 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)
-  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)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- * test 1: attach scale
- *-------------------------------------------------------------------------
- */
-
- TESTING2("attach scales");
-
- /* get the dataset id for "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach the DS_1_NAME dimension scale to "dset_a"
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- 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)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach the DS_11_NAME dimension scale to "dset_a"
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- 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)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach the DS_2_NAME dimension scale to "dset_a"
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- 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)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- *  attach the DS_21_NAME dimension scale to "dset_a"
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- 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)
-  goto out;
-
-  /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- *  attach the DS_22_NAME dimension scale to "dset_a"
- *-------------------------------------------------------------------------
- */
-
- /* get the DS dataset id */
- 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)
-  goto out;
-
-  /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
-
-
-/*-------------------------------------------------------------------------
- *  verify attachment
- *-------------------------------------------------------------------------
- */
-
- if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSis_attached(did,dsid,DIM0)<=0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
- if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSis_attached(did,dsid,DIM1)<=0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
- if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSis_attached(did,dsid,DIM1)<=0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
- if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSis_attached(did,dsid,DIM1)<=0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
-
- /* close dataset ID of "dset_a" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * test 2: get number of scales
- *-------------------------------------------------------------------------
- */
-
- TESTING2("get number of scales");
-
-/*-------------------------------------------------------------------------
- * verify that "dset_a" has dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_a" */
- 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)
-  goto out;
- if(nscales!=2)
-  goto out;
-
- /* verify that "dset_a" has 3 dimension scales at DIM 1   */
- if((nscales = H5DSget_num_scales(did,1)) < 0)
-  goto out;
- if(nscales!=3)
-  goto out;
-
- /* close dataset ID of "dset_a" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- * create datasets: 1 "data" dataset and 1 dimension scale
- *-------------------------------------------------------------------------
- */
-
- /* make a dataset */
- 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)
-  goto out;
-
-/*-------------------------------------------------------------------------
- *  attach the scale to "dset_b"
- *-------------------------------------------------------------------------
- */
-
- if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
-  goto out;
- if((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,0) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * verify if "dset_b" has dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_b" */
- 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)
-  goto out;
- if(nscales!=1)
-  goto out;
-
- /* verify that "dset_b" has 0 dimension scales at DIM 1   */
- if((nscales = H5DSget_num_scales(did,1)) < 0)
-  goto out;
- if(nscales!=0)
-  goto out;
-
- /* close dataset ID of "dset_b" */
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * test 3: detach scales
- *-------------------------------------------------------------------------
- */
-
- TESTING2("detach scales ");
-
-
-/*-------------------------------------------------------------------------
- * create datasets: one "data" dataset and 4 dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* make a dataset */
- 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)
-  goto out;
-
- /* make a DS dataset for the second dimension */
- 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)
-  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)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- *  attach the scales to "dset_c"
- *-------------------------------------------------------------------------
- */
-
- if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_c_1", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,0) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,1) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,1) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,1) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * verify if "dset_c" has dimension scales
- *-------------------------------------------------------------------------
- */
-
- 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)
-  goto out;
- if(nscales!=1)
-  goto out;
- /* verify that "dset_c" has 3 dimension scales at DIM 1   */
- if((nscales = H5DSget_num_scales(did,1)) < 0)
-  goto out;
- if(nscales!=3)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * detach the "ds_c_21" dimension scale to "dset_c"
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_c" */
- 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)
-  goto out;
-
- /* detach the "ds_c_21" dimension scale to "dset_c" in DIM 1  */
- if(H5DSdetach_scale(did,dsid,1) < 0)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- /* close dataset ID of "dset_c" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * "dset_c" must have now 2 dimension scales at DIM 1
- *-------------------------------------------------------------------------
- */
-
- 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)
-  goto out;
- if(nscales!=2)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * detach the "ds_c_22" dimension scale to "dset_c"
- *-------------------------------------------------------------------------
- */
+    /* get the DS dataset id */
+    if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
+        goto out;
 
- /* get the dataset id for "dset_c" */
- if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
-  goto out;
+    /* attach the "ds2" dimension scale to "dset_a" as the 2nd dimension  */
+    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+        goto out;
 
- /* get the DS dataset id */
- if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
-  goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
 
- /* detach the "ds_c_22" dimension scale to "dset_c" in DIM 1  */
- if(H5DSdetach_scale(did,dsid,1) < 0)
-  goto out;
+    /*-------------------------------------------------------------------------
+    *  attach the DS_21_NAME dimension scale to "dset_a"
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the DS dataset id */
+    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)
+        goto out;
 
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
 
- /* close dataset ID of "dset_c" */
- if(H5Dclose(did) < 0)
-  goto out;
+    /*-------------------------------------------------------------------------
+    *  attach the DS_22_NAME dimension scale to "dset_a"
+    *-------------------------------------------------------------------------
+    */
 
-/*-------------------------------------------------------------------------
- * "dset_c" must have now 1 dimension scale at DIM 1
- *-------------------------------------------------------------------------
- */
-
- 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)
-  goto out;
- if(nscales!=1)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * detach the "ds_c_2" dimension scale to "dset_c"
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_c" */
- 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)
-  goto out;
-
- /* detach the "ds_c_2" dimension scale to "dset_c" in DIM 1  */
- if(H5DSdetach_scale(did,dsid,1) < 0)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- /* close dataset ID of "dset_c" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * "dset_c" must have now 0 dimension scales at DIM 1
- *-------------------------------------------------------------------------
- */
-
- 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)
-  goto out;
- if(nscales!=0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- * create 3 datasets: 1 "data" dataset and 2 dimension scales
- *-------------------------------------------------------------------------
- */
- 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)
-  goto out;
- 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)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,0) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
- if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,1) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * verify
- *-------------------------------------------------------------------------
- */
-
- if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSis_attached(did,dsid,DIM0)<=0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSis_attached(did,dsid,DIM1)<=0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if(H5Dclose(did) < 0)
-  goto out;
-
-
-/*-------------------------------------------------------------------------
- * detach
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_d" */
- 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)
-  goto out;
-
- /* detach the dimension scale to "dset_d" in DIM 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)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- /* close dataset ID of "dset_d" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach again
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_d" */
- 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)
-  goto out;
-
- /* attach "ds_d_1" again in DIM 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)
-  goto out;
-
- /* verify that "ds_d_1" has only 1 scale at DIM0  */
- if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
-  goto out;
- if(nscales!=1)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- /* close dataset ID of "dset_d" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * detach/detach
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_d" */
- 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)
-  goto out;
-
- /* detach the "ds_d_2" dimension scale to "dset_d" in DIM 1  */
- if(H5DSdetach_scale(did,dsid,DIM1) < 0)
-  goto out;
-
- /* detach again, it should fail */
- 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)
-  goto out;
-
- /* verify that "ds_d_1" has no scale at DIM1  */
- if((nscales = H5DSget_num_scales(did,DIM1)) < 0)
-  goto out;
- if(nscales!=0)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- /* close dataset ID of "dset_d" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach twice
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "dset_d" */
- 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)
-  goto out;
+    /* get the DS dataset id */
+    if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
+        goto out;
 
- /* attach "ds_d_2" in DIM 1  */
- if(H5DSattach_scale(did,dsid,DIM1) < 0)
-  goto out;
+    /* attach the "ds22" dimension scale to "dset_a" as the 2nd dimension  */
+    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+        goto out;
 
- /* verify attach, it must return 1 for attach */
- if(H5DSis_attached(did,dsid,DIM1)!=1)
-  goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+
+
+    /*-------------------------------------------------------------------------
+    *  verify attachment
+    *-------------------------------------------------------------------------
+    */
+
+    if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSis_attached(did,dsid,DIM0)<=0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
+
+    if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSis_attached(did,dsid,DIM1)<=0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
+
+    if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSis_attached(did,dsid,DIM1)<=0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
+
+    if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSis_attached(did,dsid,DIM1)<=0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
+
+
+    /* close dataset ID of "dset_a" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * test 2: get number of scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("get number of scales");
+
+    /*-------------------------------------------------------------------------
+    * verify that "dset_a" has dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_a" */
+    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)
+        goto out;
+    if(nscales!=2)
+        goto out;
+
+    /* verify that "dset_a" has 3 dimension scales at DIM 1   */
+    if((nscales = H5DSget_num_scales(did,1)) < 0)
+        goto out;
+    if(nscales!=3)
+        goto out;
+
+    /* close dataset ID of "dset_a" */
+    if(H5Dclose(did) < 0)
+        goto out;
 
- /* verify that "ds_d_2" has only 1 scale at DIM1  */
- if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
-  goto out;
- if(nscales!=1)
-  goto out;
 
- /* attach "ds_d_2" again in DIM 1  */
- if(H5DSattach_scale(did,dsid,DIM1) < 0)
-  goto out;
+    /*-------------------------------------------------------------------------
+    * create datasets: 1 "data" dataset and 1 dimension scale
+    *-------------------------------------------------------------------------
+    */
+
+    /* make a dataset */
+    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)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    *  attach the scale to "dset_b"
+    *-------------------------------------------------------------------------
+    */
+
+    if((did = H5Dopen2(fid,"dset_b", H5P_DEFAULT)) < 0)
+        goto out;
+    if((dsid = H5Dopen2(fid,"ds_b_1", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,0) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * verify if "dset_b" has dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_b" */
+    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)
+        goto out;
+    if(nscales!=1)
+        goto out;
+
+    /* verify that "dset_b" has 0 dimension scales at DIM 1   */
+    if((nscales = H5DSget_num_scales(did,1)) < 0)
+        goto out;
+    if(nscales!=0)
+        goto out;
+
+    /* close dataset ID of "dset_b" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * test 3: detach scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("detach scales ");
+
+
+    /*-------------------------------------------------------------------------
+    * create datasets: one "data" dataset and 4 dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* make a dataset */
+    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)
+        goto out;
+
+    /* make a DS dataset for the second dimension */
+    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)
+        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)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    *  attach the scales to "dset_c"
+    *-------------------------------------------------------------------------
+    */
+
+    if((did = H5Dopen2(fid,"dset_c", H5P_DEFAULT)) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_c_1", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,0) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_c_2", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,1) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_c_21", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,1) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_c_22", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,1) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * verify if "dset_c" has dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+        goto out;
+    if(nscales!=1)
+        goto out;
+    /* verify that "dset_c" has 3 dimension scales at DIM 1   */
+    if((nscales = H5DSget_num_scales(did,1)) < 0)
+        goto out;
+    if(nscales!=3)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * detach the "ds_c_21" dimension scale to "dset_c"
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_c" */
+    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)
+        goto out;
+
+    /* detach the "ds_c_21" dimension scale to "dset_c" in DIM 1  */
+    if(H5DSdetach_scale(did,dsid,1) < 0)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_c" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * "dset_c" must have now 2 dimension scales at DIM 1
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+        goto out;
+    if(nscales!=2)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * detach the "ds_c_22" dimension scale to "dset_c"
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_c" */
+    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)
+        goto out;
+
+    /* detach the "ds_c_22" dimension scale to "dset_c" in DIM 1  */
+    if(H5DSdetach_scale(did,dsid,1) < 0)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_c" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * "dset_c" must have now 1 dimension scale at DIM 1
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+        goto out;
+    if(nscales!=1)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * detach the "ds_c_2" dimension scale to "dset_c"
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_c" */
+    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)
+        goto out;
+
+    /* detach the "ds_c_2" dimension scale to "dset_c" in DIM 1  */
+    if(H5DSdetach_scale(did,dsid,1) < 0)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_c" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * "dset_c" must have now 0 dimension scales at DIM 1
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+        goto out;
+    if(nscales!=0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * create 3 datasets: 1 "data" dataset and 2 dimension scales
+    *-------------------------------------------------------------------------
+    */
+    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)
+        goto out;
+    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)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,0) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,1) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * verify
+    *-------------------------------------------------------------------------
+    */
+
+    if((did = H5Dopen2(fid,"dset_d", H5P_DEFAULT)) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_d_1", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSis_attached(did,dsid,DIM0)<=0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_d_2", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSis_attached(did,dsid,DIM1)<=0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if(H5Dclose(did) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * detach
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_d" */
+    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)
+        goto out;
+
+    /* detach the dimension scale to "dset_d" in DIM 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)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_d" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach again
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_d" */
+    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)
+        goto out;
+
+    /* attach "ds_d_1" again in DIM 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)
+        goto out;
+
+    /* verify that "ds_d_1" has only 1 scale at DIM0  */
+    if((nscales = H5DSget_num_scales(did,DIM0)) < 0)
+        goto out;
+    if(nscales!=1)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_d" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * detach/detach
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_d" */
+    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)
+        goto out;
+
+    /* detach the "ds_d_2" dimension scale to "dset_d" in DIM 1  */
+    if(H5DSdetach_scale(did,dsid,DIM1) < 0)
+        goto out;
+
+    /* detach again, it should fail */
+    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)
+        goto out;
+
+    /* verify that "ds_d_1" has no scale at DIM1  */
+    if((nscales = H5DSget_num_scales(did,DIM1)) < 0)
+        goto out;
+    if(nscales!=0)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_d" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach twice
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "dset_d" */
+    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)
+        goto out;
+
+    /* attach "ds_d_2" in DIM 1  */
+    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+        goto out;
+
+    /* verify attach, it must return 1 for attach */
+    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)
+        goto out;
+    if(nscales!=1)
+        goto out;
+
+    /* attach "ds_d_2" again in DIM 1  */
+    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+        goto out;
+
+    /* verify attach, it must return 1 for attach */
+    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)
+        goto out;
+    if(nscales != 1)
+        goto out;
+
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_d" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create 10 datasets: 5 "data" dataset and 5 dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* 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)
+        goto out;
+
+    for(i = 0; i < 5; i++) {
+        sprintf(dname,"dset_%d",i);
+        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 = H5Dcreate2(gid, sname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            goto out;
+        if(H5DSset_scale(dsid,"scale") < 0)
+            goto out;
+        if(H5Dclose(dsid) < 0)
+            goto out;
+        if(H5Dclose(did) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * attach for DIM 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)
+                goto out;
+            if(H5DSattach_scale(did, dsid, DIM0) < 0)
+                goto out;
+            if(H5Dclose(dsid) < 0)
+                goto out;
+        }
+        if(H5Dclose(did) < 0)
+            goto out;
+    }
+
+    /*-------------------------------------------------------------------------
+    * dettach for DIM0
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+                goto out;
+            if(H5DSdetach_scale(did, dsid, DIM0) < 0)
+                goto out;
+            if(H5Dclose(dsid) < 0)
+                goto out;
+        }
+        if(H5Dclose(did) < 0)
+            goto out;
+    }
+
+
+    /*-------------------------------------------------------------------------
+    * attach again for DIM0
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+                goto out;
+            if(H5DSattach_scale(did,dsid,DIM0) < 0)
+                goto out;
+            if(H5Dclose(dsid) < 0)
+                goto out;
+        }
+        if(H5Dclose(did) < 0)
+            goto out;
+    }
+
+    /* close */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
+
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * create a dataset and attach only to 1 dimension
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach only to 1 dimension");
+
+    /* make a dataset */
+    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)
+        goto out;
+
+    /* attach the DS to dimension 1 */
+    if((did = H5Dopen2(fid,"dset_e", H5P_DEFAULT)) < 0)
+        goto out;
+    if((dsid = H5Dopen2(fid,"ds_e_1", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+        goto out;
+    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++)
+    {
+        if( i==1 )
+        {
+            if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
+                goto out;
+        }
+        else
+        {
+            if(H5DSdetach_scale(did,dsid,(unsigned)i)!=FAIL)
+                goto out;
+        }
+    }
+
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * test 4: set/get label
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("set/get label");
+
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * set label
+    *-------------------------------------------------------------------------
+    */
+
+    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+        goto out;
+    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * get the scale name using a static buffer
+    *-------------------------------------------------------------------------
+    */
+
+    if(H5DSget_label(did,DIM0,dim0_label,sizeof(dim0_label)) < 0)
+        goto out;
+    if(H5DSget_label(did,DIM1,dim1_label,sizeof(dim1_label)) < 0)
+        goto out;
+
+    if(strcmp(DIM0_LABEL,dim0_label)!=0)
+        goto out;
+    if(strcmp(DIM1_LABEL,dim1_label)!=0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * get the scale name using a dynamic buffer
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+        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)
+        goto out;
+
+    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)
+        goto out;
+
+    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)
+        goto out;
+
+    if(dim0_labeld)
+    {
+        free(dim0_labeld);
+        dim0_labeld=NULL;
+    }
+    if(dim1_labeld)
+    {
+        free(dim1_labeld);
+        dim1_labeld=NULL;
+    }
+
+
+    /*-------------------------------------------------------------------------
+    * get the label using a static buffer smaller than the string lenght
+    *-------------------------------------------------------------------------
+    */
+
+    if(H5DSget_label(did,DIM0,dim0_labels,sizeof(dim0_labels)) < 0)
+        goto out;
+    if(H5DSget_label(did,DIM1,dim1_labels,sizeof(dim1_labels)) < 0)
+        goto out;
+
+    if(strncmp(DIM0_LABEL,dim0_label,sizeof(dim0_labels)-1)!=0)
+        goto out;
+    if(strncmp(DIM1_LABEL,dim1_label,sizeof(dim1_labels)-1)!=0)
+        goto out;
+
+
+
+    if(H5Dclose(did))
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test 5: set scale/get scale name
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("set scale/get scale name");
+
+    if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+
+    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)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * get the scale name using a dynamic buffer
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the lenght of the scale name (pass NULL in name) */
+    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)
+        goto out;
+
+    /* get the scale name using this buffer */
+    if(H5DSget_scale_name(dsid,name_out,(size_t)name_len) < 0)
+        goto out;
+
+    if(strcmp(SCALE_1_NAME,name_out)!=0)
+        goto out;
+
+    if(name_out)
+    {
+        free(name_out);
+        name_out=NULL;
+    }
+
+    /*-------------------------------------------------------------------------
+    * get the scale name using a static buffer
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the scale name using this buffer */
+    if(H5DSget_scale_name(dsid,sname,sizeof(sname)) < 0)
+        goto out;
+
+    if(strcmp(SCALE_1_NAME,sname)!=0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * get the scale name using a static buffer smaller than the string lenght
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the scale name using this buffer */
+    if(H5DSget_scale_name(dsid,snames,sizeof(snames)) < 0)
+        goto out;
+
+    if(strncmp(SCALE_1_NAME,snames,sizeof(snames)-1)!=0)
+        goto out;
+
+    if(H5Dclose(dsid))
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * add scale names
+    *-------------------------------------------------------------------------
+    */
 
- /* verify attach, it must return 1 for attach */
- 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)
-  goto out;
- if(nscales != 1)
-  goto out;
-
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- /* close dataset ID of "dset_d" */
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * create 10 datasets: 5 "data" dataset and 5 dimension scales
- *-------------------------------------------------------------------------
- */
-
-  /* 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)
-  goto out;
-
- for(i = 0; i < 5; i++) {
-  sprintf(dname,"dset_%d",i);
-  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 = H5Dcreate2(gid, sname, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-   goto out;
-  if(H5DSset_scale(dsid,"scale") < 0)
-   goto out;
-  if(H5Dclose(dsid) < 0)
-   goto out;
-  if(H5Dclose(did) < 0)
-   goto out;
- }
-
-/*-------------------------------------------------------------------------
- * attach for DIM 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)
-    goto out;
-   if(H5DSattach_scale(did, dsid, DIM0) < 0)
-    goto out;
-   if(H5Dclose(dsid) < 0)
-    goto out;
-  }
-  if(H5Dclose(did) < 0)
-   goto out;
- }
-
-/*-------------------------------------------------------------------------
- * dettach for DIM0
- *-------------------------------------------------------------------------
- */
-
- 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)
-    goto out;
-   if(H5DSdetach_scale(did, dsid, DIM0) < 0)
-    goto out;
-   if(H5Dclose(dsid) < 0)
-    goto out;
-  }
-  if(H5Dclose(did) < 0)
-   goto out;
- }
-
-
-/*-------------------------------------------------------------------------
- * attach again for DIM0
- *-------------------------------------------------------------------------
- */
-
- 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)
-    goto out;
-   if(H5DSattach_scale(did,dsid,DIM0) < 0)
-    goto out;
-   if(H5Dclose(dsid) < 0)
-    goto out;
-  }
-  if(H5Dclose(did) < 0)
-   goto out;
- }
-
- /* close */
- if(H5Sclose(sid) < 0)
-  goto out;
- if(H5Gclose(gid) < 0)
-  goto out;
-
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * create a dataset and attach only to 1 dimension
- *-------------------------------------------------------------------------
- */
-
- TESTING2("attach only to 1 dimension");
-
- /* make a dataset */
- 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)
-  goto out;
-
- /* attach the DS to dimension 1 */
- if((did = H5Dopen2(fid,"dset_e", H5P_DEFAULT)) < 0)
-  goto out;
- if((dsid = H5Dopen2(fid,"ds_e_1", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,DIM1) < 0)
-  goto out;
- 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++)
- {
-  if( i==1 )
-  {
-   if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
-    goto out;
-  }
-  else
-  {
-   if(H5DSdetach_scale(did,dsid,(unsigned)i)!=FAIL)
-    goto out;
-  }
- }
-
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * test 4: set/get label
- *-------------------------------------------------------------------------
- */
-
- TESTING2("set/get label");
-
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * set label
- *-------------------------------------------------------------------------
- */
-
- if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
-  goto out;
- if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * get the scale name using a static buffer
- *-------------------------------------------------------------------------
- */
-
- if(H5DSget_label(did,DIM0,dim0_label,sizeof(dim0_label)) < 0)
-  goto out;
- if(H5DSget_label(did,DIM1,dim1_label,sizeof(dim1_label)) < 0)
-  goto out;
-
- if(strcmp(DIM0_LABEL,dim0_label)!=0)
-  goto out;
- if(strcmp(DIM1_LABEL,dim1_label)!=0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * get the scale name using a dynamic buffer
- *-------------------------------------------------------------------------
- */
-
- 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)
-  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)
-  goto out;
-
- 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)
-  goto out;
-
- 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)
-  goto out;
-
- if(dim0_labeld)
- {
-  free(dim0_labeld);
-  dim0_labeld=NULL;
- }
- if(dim1_labeld)
- {
-  free(dim1_labeld);
-  dim1_labeld=NULL;
- }
-
-
-/*-------------------------------------------------------------------------
- * get the label using a static buffer smaller than the string lenght
- *-------------------------------------------------------------------------
- */
-
- if(H5DSget_label(did,DIM0,dim0_labels,sizeof(dim0_labels)) < 0)
-  goto out;
- if(H5DSget_label(did,DIM1,dim1_labels,sizeof(dim1_labels)) < 0)
-  goto out;
-
- if(strncmp(DIM0_LABEL,dim0_label,sizeof(dim0_labels)-1)!=0)
-  goto out;
- if(strncmp(DIM1_LABEL,dim1_label,sizeof(dim1_labels)-1)!=0)
-  goto out;
-
-
-
- if(H5Dclose(did))
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * test 5: set scale/get scale name
- *-------------------------------------------------------------------------
- */
- TESTING2("set scale/get scale name");
-
- if((dsid = H5Dopen2(fid,DS_1_NAME, H5P_DEFAULT)) < 0)
-  goto out;
-
- 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)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * get the scale name using a dynamic buffer
- *-------------------------------------------------------------------------
- */
+    if((dsid = H5Dopen2(fid,DS_11_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSset_scale(dsid,SCALE_11_NAME) < 0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
 
- /* get the lenght of the scale name (pass NULL in name) */
- if((name_len=H5DSget_scale_name(dsid,NULL,(size_t)0)) < 0)
-  goto out;
+    if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
 
- /* allocate a  buffer */
- name_out = (char*)malloc(name_len * sizeof(char));
- 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)
-  goto out;
-
- if(strcmp(SCALE_1_NAME,name_out)!=0)
-  goto out;
-
- if(name_out)
- {
-  free(name_out);
-  name_out=NULL;
- }
-
-/*-------------------------------------------------------------------------
- * get the scale name using a static buffer
- *-------------------------------------------------------------------------
- */
-
- /* get the scale name using this buffer */
- if(H5DSget_scale_name(dsid,sname,sizeof(sname)) < 0)
-  goto out;
-
- if(strcmp(SCALE_1_NAME,sname)!=0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * get the scale name using a static buffer smaller than the string lenght
- *-------------------------------------------------------------------------
- */
-
- /* get the scale name using this buffer */
- if(H5DSget_scale_name(dsid,snames,sizeof(snames)) < 0)
-  goto out;
-
- if(strncmp(SCALE_1_NAME,snames,sizeof(snames)-1)!=0)
-  goto out;
-
- if(H5Dclose(dsid))
-  goto out;
-
-/*-------------------------------------------------------------------------
- * add scale names
- *-------------------------------------------------------------------------
- */
-
- if((dsid = H5Dopen2(fid,DS_11_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSset_scale(dsid,SCALE_11_NAME) < 0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
- if((dsid = H5Dopen2(fid,DS_2_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
- if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSset_scale(dsid,SCALE_21_NAME) < 0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
- if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSset_scale(dsid,SCALE_22_NAME) < 0)
-  goto out;
- if(H5Dclose(dsid))
-  goto out;
-
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * test 6: test iterate scales with a function verify_scale
- *-------------------------------------------------------------------------
- */
- TESTING2("iterate scales (verify scale)");
-
- /* get the dataset id for "dset_a" */
- 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)
-  goto out;
-
- /* iterate trough the 2nd dimension of "dset_a" and verify that its DS is valid
+    if((dsid = H5Dopen2(fid,DS_21_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSset_scale(dsid,SCALE_21_NAME) < 0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
+
+    if((dsid = H5Dopen2(fid,DS_22_NAME, H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSset_scale(dsid,SCALE_22_NAME) < 0)
+        goto out;
+    if(H5Dclose(dsid))
+        goto out;
+
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test 6: test iterate scales with a function verify_scale
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("iterate scales (verify scale)");
+
+    /* get the dataset id for "dset_a" */
+    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)
+        goto out;
+
+    /* iterate trough the 2nd dimension of "dset_a" and verify that its DS is valid
     start at DS index 2 */
- dim = 1;
- scale_idx = 2;
+    dim = 1;
+    scale_idx = 2;
 
- if(H5DSiterate_scales(did,dim,&scale_idx,verify_scale,NULL) < 0)
-  goto out;
+    if(H5DSiterate_scales(did,dim,&scale_idx,verify_scale,NULL) < 0)
+        goto out;
 
- /* close dataset ID of "dset_a" */
- if(H5Dclose(did) < 0)
-  goto out;
+    /* close dataset ID of "dset_a" */
+    if(H5Dclose(did) < 0)
+        goto out;
 
- PASSED();
+    PASSED();
 
 
-/*-------------------------------------------------------------------------
- * test 7: test iterate scales with a function read_scale
- *-------------------------------------------------------------------------
- */
- TESTING2("iterate scales (read scale values)");
+    /*-------------------------------------------------------------------------
+    * test 7: test iterate scales with a function read_scale
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("iterate scales (read scale values)");
 
 
- /* get the dataset id for "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
+    /* get the dataset id for "dset_a" */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- dim = 0;
+    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)
-  goto out;
+    /* iterate trough the 1st dimension of "dset_a" and read the DS  */
+    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
+    /* iterate trough the 2nd dimension of "dset_a" and read the DS
     start at DS index 2 */
- dim = 1;
- scale_idx = 2;
-
- if(H5DSiterate_scales(did,dim,&scale_idx,read_scale,s22_wbuf) < 0)
-  goto out;
-
- /* close dataset ID of "dset_a" */
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * test 8: test iterate scales with a function match_dim_scale
- *-------------------------------------------------------------------------
- */
- TESTING2("iterate scales (verify the scale sizes match)");
-
- /* get the dataset id for "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* get dataset space */
- if((sid = H5Dget_space(did)) < 0)
-  goto out;
-
- /* get rank */
- if((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
-
- /* get dimensions of dataset */
- if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
-  goto out;
-
- {
-  int match_size; /* does this scale size matches the dataset DIM size */
-  int idx=0;      /* scale index to start iterating, on return, index where iterator stoped */
-
-  /* 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)
-    goto out;
-
-   /* "dset_a" was defined with all dimension scales size matching the size of its dimensions */
-   if(match_size==0)
-    goto out;
-
-   /* both DS_1_NAME and DS_2_NAME are the on the first index */
-   if(idx!=0)
-    goto out;
-  }
- }
-
-
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Sclose(sid) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * test 9: test iterate scales with a function match_dim_scale
- *-------------------------------------------------------------------------
- */
- TESTING2("iterate scales (verify the scale sizes do not match)");
-
-/*-------------------------------------------------------------------------
- * create 3 datasets: 1 "data" dataset and dimension scales (some are empty)
- *-------------------------------------------------------------------------
- */
- 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)
-  goto out;
- 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)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach them
- *-------------------------------------------------------------------------
- */
- if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
-  goto out;
-
- if((dsid = H5Dopen2(fid,"ds_f_1", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,DIM0) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
- if((dsid = H5Dopen2(fid,"ds_f_11", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,DIM0) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
- if((dsid = H5Dopen2(fid,"ds_f_2", H5P_DEFAULT)) < 0)
-  goto out;
- if(H5DSattach_scale(did,dsid,DIM1) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- if(H5Dclose(did) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * verify match
- *-------------------------------------------------------------------------
- */
- /* get the dataset id for "dset_f" */
- if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* get dataset space */
- if((sid = H5Dget_space(did)) < 0)
-  goto out;
-
- /* get rank */
- if((rank=H5Sget_simple_extent_ndims(sid)) < 0)
-  goto out;
-
- /* get dimensions of dataset */
- if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
-  goto out;
-
- {
-  int match_size; /* does this scale size matches the dataset DIM size */
-  int idx;        /* scale index to start iterating, on return, index where iterator stoped */
-
-  /* iterate trough all the dimensions  */
-  for(dim=0; dim<(unsigned)rank; dim++)
-  {
-   /* always start at 1st scale */
-   idx=0;
-
-   if((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL)) < 0)
-    goto out;
-
-    /* "dset_e" was defined with :
-        dim 0: 2 scales, first is empty
-        dim 1: 1 scale, empty */
-   switch(dim)
-   {
-   case 0: /* for DIM 0, we get a valid scale at 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)
-     goto out;
-   }/*switch*/
-  }/*for*/
- }
-
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Sclose(sid) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * end
- *-------------------------------------------------------------------------
- */
-
- /* close */
- H5Fclose(fid);
-
- return 0;
-
- /* error zone, gracefully close */
+    dim = 1;
+    scale_idx = 2;
+
+    if(H5DSiterate_scales(did,dim,&scale_idx,read_scale,s22_wbuf) < 0)
+        goto out;
+
+    /* close dataset ID of "dset_a" */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test 8: test iterate scales with a function match_dim_scale
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("iterate scales (verify the scale sizes match)");
+
+    /* get the dataset id for "dset_a" */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* get dataset space */
+    if((sid = H5Dget_space(did)) < 0)
+        goto out;
+
+    /* get rank */
+    if((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
+
+    /* get dimensions of dataset */
+    if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
+        goto out;
+
+    {
+        int match_size; /* does this scale size matches the dataset DIM size */
+        int idx=0;      /* scale index to start iterating, on return, index where iterator stoped */
+
+        /* 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)
+                goto out;
+
+            /* "dset_a" was defined with all dimension scales size matching the size of its dimensions */
+            if(match_size==0)
+                goto out;
+
+            /* both DS_1_NAME and DS_2_NAME are the on the first index */
+            if(idx!=0)
+                goto out;
+        }
+    }
+
+
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * test 9: test iterate scales with a function match_dim_scale
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("iterate scales (verify the scale sizes do not match)");
+
+    /*-------------------------------------------------------------------------
+    * create 3 datasets: 1 "data" dataset and dimension scales (some are empty)
+    *-------------------------------------------------------------------------
+    */
+    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)
+        goto out;
+    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)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach them
+    *-------------------------------------------------------------------------
+    */
+    if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
+        goto out;
+
+    if((dsid = H5Dopen2(fid,"ds_f_1", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if((dsid = H5Dopen2(fid,"ds_f_11", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if((dsid = H5Dopen2(fid,"ds_f_2", H5P_DEFAULT)) < 0)
+        goto out;
+    if(H5DSattach_scale(did,dsid,DIM1) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * verify match
+    *-------------------------------------------------------------------------
+    */
+    /* get the dataset id for "dset_f" */
+    if((did = H5Dopen2(fid,"dset_f", H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* get dataset space */
+    if((sid = H5Dget_space(did)) < 0)
+        goto out;
+
+    /* get rank */
+    if((rank=H5Sget_simple_extent_ndims(sid)) < 0)
+        goto out;
+
+    /* get dimensions of dataset */
+    if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
+        goto out;
+
+    {
+        int match_size; /* does this scale size matches the dataset DIM size */
+        int idx;        /* scale index to start iterating, on return, index where iterator stoped */
+
+        /* iterate trough all the dimensions  */
+        for(dim=0; dim<(unsigned)rank; dim++)
+        {
+            /* always start at 1st scale */
+            idx=0;
+
+            if((match_size=H5DSiterate_scales(did,dim,&idx,match_dim_scale,NULL)) < 0)
+                goto out;
+
+            /* "dset_e" was defined with :
+            dim 0: 2 scales, first is empty
+            dim 1: 1 scale, empty */
+            switch(dim)
+            {
+            case 0: /* for DIM 0, we get a valid scale at 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)
+                    goto out;
+            }/*switch*/
+        }/*for*/
+    }
+
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * end
+    *-------------------------------------------------------------------------
+    */
+
+    /* close */
+    H5Fclose(fid);
+
+    return 0;
+
+    /* error zone, gracefully close */
 out:
- H5E_BEGIN_TRY {
-  H5Dclose(did);
-  H5Fclose(fid);
- } H5E_END_TRY;
- H5_FAILED();
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    H5_FAILED();
+    return FAIL;
 }
 
 
@@ -1465,25 +1465,25 @@ out:
 
 static herr_t verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
 {
- /* define a default zero value for return. This will cause the iterator to continue */
- int ret = 0;
+    /* define a default zero value for return. This will cause the iterator to continue */
+    int ret = 0;
 
- /* unused */
- dset=dset;
- dim=dim;
- visitor_data=visitor_data;
+    /* unused */
+    dset=dset;
+    dim=dim;
+    visitor_data=visitor_data;
 
- /* define a positive value for return value. This will cause the iterator to
+    /* define a positive value for return value. This will cause the iterator to
     immediately return that positive value, indicating short-circuit success
-  */
+    */
 
- /* the parameter DS dataset must be a valid DS dataset */
- if((H5DSis_scale(scale_id))==1)
- {
-  ret = 1;
- }
+    /* the parameter DS dataset must be a valid DS dataset */
+    if((H5DSis_scale(scale_id))==1)
+    {
+        ret = 1;
+    }
 
- return ret;
+    return ret;
 }
 
 
@@ -1507,78 +1507,78 @@ static herr_t verify_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visit
 
 static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_data)
 {
- int      ret = 0;   /* define a default zero value for return. This will cause the iterator to continue */
- hid_t    sid;       /* space ID */
- hid_t    tid = -1;  /* file type ID */
- hid_t    mtid = -1; /* memory type ID */
- hssize_t nelmts;    /* number of data elements */
- char     *buf=NULL; /* data buffer */
- size_t   size;
- int      i;
- char     *data=visitor_data;
-
-  /* unused */
- dset=dset;
- dim=dim;
-
- /* get space */
- if((sid = H5Dget_space(scale_id)) < 0)
-  goto out;
- /* get type */
- if((tid = H5Dget_type(scale_id)) < 0)
-   goto out;
- /* get size of the DS array */
- if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
-  goto out;
- /* get type */
- if((mtid=H5Tget_native_type(tid,H5T_DIR_DEFAULT)) < 0)
-  goto out;
- /* get type size */
- if((size=H5Tget_size(mtid))==0)
-  goto out;
-
- if(nelmts)
- {
-  buf=(char *) malloc((size_t)(nelmts*size));
-  if( buf==NULL)
-   goto out;
-  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])
-   {
-    printf("read and write buffers differ\n");
-    goto out;
-   }
-  }
-
- } /* if */
-
- if(H5Sclose(sid) < 0)
-  goto out;
- if(H5Tclose(tid) < 0)
-  goto out;
- if(H5Tclose(mtid) < 0)
-  goto out;
- if(buf)
-  free(buf);
-
-
- return ret;
-
- /* error zone, gracefully close */
- out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
-  H5Tclose(tid);
-  H5Tclose(mtid);
-  if(buf)
-   free(buf);
- } H5E_END_TRY;
-
-  return FAIL;
+    int      ret = 0;   /* define a default zero value for return. This will cause the iterator to continue */
+    hid_t    sid;       /* space ID */
+    hid_t    tid = -1;  /* file type ID */
+    hid_t    mtid = -1; /* memory type ID */
+    hssize_t nelmts;    /* number of data elements */
+    char     *buf=NULL; /* data buffer */
+    size_t   size;
+    int      i;
+    char     *data=visitor_data;
+
+    /* unused */
+    dset=dset;
+    dim=dim;
+
+    /* get space */
+    if((sid = H5Dget_space(scale_id)) < 0)
+        goto out;
+    /* get type */
+    if((tid = H5Dget_type(scale_id)) < 0)
+        goto out;
+    /* get size of the DS array */
+    if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+        goto out;
+    /* get type */
+    if((mtid=H5Tget_native_type(tid,H5T_DIR_DEFAULT)) < 0)
+        goto out;
+    /* get type size */
+    if((size=H5Tget_size(mtid))==0)
+        goto out;
+
+    if(nelmts)
+    {
+        buf=(char *) malloc((size_t)(nelmts*size));
+        if( buf==NULL)
+            goto out;
+        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])
+            {
+                printf("read and write buffers differ\n");
+                goto out;
+            }
+        }
+
+    } /* if */
+
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Tclose(tid) < 0)
+        goto out;
+    if(H5Tclose(mtid) < 0)
+        goto out;
+    if(buf)
+        free(buf);
+
+
+    return ret;
+
+    /* error zone, gracefully close */
+out:
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Tclose(tid);
+        H5Tclose(mtid);
+        if(buf)
+            free(buf);
+    } H5E_END_TRY;
+
+    return FAIL;
 }
 
 
@@ -1601,66 +1601,66 @@ static herr_t read_scale(hid_t dset, unsigned dim, hid_t scale_id, void *visitor
 
 static herr_t match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor_data)
 {
- int       ret = 0;              /* define a default zero value for return. This will cause the iterator to continue */
- hid_t     sid;                  /* space ID */
- hssize_t  nelmts;               /* size of a dimension scale array */
- hsize_t   dims[H5S_MAX_RANK];   /* dimensions of dataset */
- hsize_t   storage_size;
+    int       ret = 0;              /* define a default zero value for return. This will cause the iterator to continue */
+    hid_t     sid;                  /* space ID */
+    hssize_t  nelmts;               /* size of a dimension scale array */
+    hsize_t   dims[H5S_MAX_RANK];   /* dimensions of dataset */
+    hsize_t   storage_size;
 
     /* Stop compiler from whining about "unused parameters" */
     visitor_data = visitor_data;
 
-/*-------------------------------------------------------------------------
- * get DID (dataset) space info
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * get DID (dataset) space info
+    *-------------------------------------------------------------------------
+    */
 
- /* get dataset space */
- if((sid = H5Dget_space(did)) < 0)
-  goto out;
+    /* get dataset space */
+    if((sid = H5Dget_space(did)) < 0)
+        goto out;
 
- /* get dimensions of dataset */
- if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
-  goto out;
+    /* get dimensions of dataset */
+    if(H5Sget_simple_extent_dims(sid,dims,NULL) < 0)
+        goto out;
 
- /* close the dataspace id */
- if(H5Sclose(sid) < 0)
-  goto out;
+    /* close the dataspace id */
+    if(H5Sclose(sid) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * get DSID (scale) space info
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * get DSID (scale) space info
+    *-------------------------------------------------------------------------
+    */
 
- /* get the space for the scale */
- if((sid = H5Dget_space(dsid)) < 0)
-  goto out;
+    /* get the space for the scale */
+    if((sid = H5Dget_space(dsid)) < 0)
+        goto out;
 
- /* get size of the DS array */
- if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
-  goto out;
+    /* get size of the DS array */
+    if((nelmts = H5Sget_simple_extent_npoints(sid)) < 0)
+        goto out;
 
- /* close */
- if(H5Sclose(sid) < 0)
-  goto out;
+    /* close */
+    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])
-  ret = 1;
+    /* the size of the DS array must match the dimension of the dataset */
+    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 the scale is empty assume it cannot be used */
+    storage_size=H5Dget_storage_size(dsid);
 
- if(storage_size==0)
-  ret = 0;
+    if(storage_size==0)
+        ret = 0;
 
- return ret;
+    return ret;
 
 out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
- } H5E_END_TRY;
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+    } H5E_END_TRY;
+    return FAIL;
 }
 
 
@@ -1688,16 +1688,12 @@ static herr_t op_bogus(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_d
     scale_id = scale_id;
     visitor_data = visitor_data;
 
- /* define a default zero value for return. This will cause the iterator to continue */
- return 0;
+    /* define a default zero value for return. This will cause the iterator to continue */
+    return 0;
 }
 
 
 
-
-
-
-
 /*-------------------------------------------------------------------------
  * test error conditions
  *-------------------------------------------------------------------------
@@ -1705,374 +1701,374 @@ static herr_t op_bogus(hid_t dset, unsigned dim, hid_t scale_id, void *visitor_d
 
 static int test_errors(void)
 {
- hid_t   fid;                                              /* file ID */
- int     rank     = RANK;                                  /* rank of data dataset */
- int     rankds   = 1;                                     /* rank of DS dataset */
- hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
- hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
- hid_t   did = -1;                                         /* dataset ID */
- hid_t   dsid = -1;                                        /* scale ID */
- hid_t   gid = -1;                                         /* group ID */
- hid_t   sid = -1;                                         /* space ID */
- hid_t   sidds = -1;                                       /* space ID */
- hsize_t pal_dims[] = {9,3};
-
- printf("Testing error conditions\n");
+    hid_t   fid;                                              /* file ID */
+    int     rank     = RANK;                                  /* rank of data dataset */
+    int     rankds   = 1;                                     /* rank of DS dataset */
+    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
+    hsize_t s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
+    hid_t   did = -1;                                         /* dataset ID */
+    hid_t   dsid = -1;                                        /* scale ID */
+    hid_t   gid = -1;                                         /* group ID */
+    hid_t   sid = -1;                                         /* space ID */
+    hid_t   sidds = -1;                                       /* space ID */
+    hsize_t pal_dims[] = {9,3};
+
+    printf("Testing error conditions\n");
+
+    /*-------------------------------------------------------------------------
+    * create a file, spaces, dataset and group ids
+    *-------------------------------------------------------------------------
+    */
+
+    /* create a file using default properties */
+    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)
+        goto out;
+    /* create the data space for the scale */
+    if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
+        goto out;
+    /* create a dataset */
+    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 = H5Dcreate2(fid, "ds_a", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attempt to attach a dataset to itself, it should fail
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach a dataset to itself");
+
+    if(H5DSattach_scale(did, did, 0) == SUCCEED)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * attempt to attach a group with a dataset, it should fail
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("attach a group with a dataset");
+
+    if(H5DSattach_scale(gid,dsid,0)==SUCCEED)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * attempt to attach a dataset with a group, it should fail
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("attach a dataset with a group");
+
+    if(H5DSattach_scale(did,gid,0)==SUCCEED)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * attempt to set scale for a group, it should fail
+    *-------------------------------------------------------------------------
+    */
+    TESTING2("set scale for a group");
+
+    if(H5DSset_scale(gid,"scale 1")==SUCCEED)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * close IDs for this set
+    *-------------------------------------------------------------------------
+    */
+
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Sclose(sidds) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
+
+
+    /*-------------------------------------------------------------------------
+    * try to attach a scale that has scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach a scale that has scales");
+
+    /* create the data space for the scale */
+    if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
+        goto out;
+
+    /* create a dataset "ds_b" for the scale */
+    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)
+        goto out;
+
+    /* attach "ds_b" to "ds_a", valid */
+    if(H5DSattach_scale(did, dsid, 0) < 0)
+        goto out;
+
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Sclose(sidds) < 0)
+        goto out;
+
+    /* open the previous written "dset_a" */
+    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)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * create a file, spaces, dataset and group ids
- *-------------------------------------------------------------------------
- */
+    /* try to attach "ds_a" to "dset_a", not valid */
+    if(H5DSattach_scale(did,dsid,0)==SUCCEED)
+        goto out;
 
- /* create a file using default properties */
- 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)
-  goto out;
- /* create the data space for the scale */
- if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
-  goto out;
-  /* create a dataset */
- 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 = H5Dcreate2(fid, "ds_a", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  goto out;
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    /* open the previous written "ds_a" */
+    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)
+        goto out;
+
+    /* detach "ds_b" to "ds_a" */
+    if(H5DSdetach_scale(did,dsid,0) < 0)
+        goto out;
+
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * attempt to attach a dataset to itself, it should fail
- *-------------------------------------------------------------------------
- */
+    PASSED();
 
- TESTING2("attach a dataset to itself");
+    /*-------------------------------------------------------------------------
+    * try to attach a dataset that is a scale
+    *-------------------------------------------------------------------------
+    */
 
- if(H5DSattach_scale(did, did, 0) == SUCCEED)
-  goto out;
+    TESTING2("attach to a dataset that is a scale");
 
- PASSED();
+    /* open the previous written "ds_b", that is a scale */
+    if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * attempt to attach a group with a dataset, it should fail
- *-------------------------------------------------------------------------
- */
- TESTING2("attach a group with a dataset");
+    /* open the previous written "ds_a" */
+    if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- if(H5DSattach_scale(gid,dsid,0)==SUCCEED)
-  goto out;
+    /* try to attach "ds_a" to "ds_b", not valid */
+    if(H5DSattach_scale(dsid,did,0)==SUCCEED)
+        goto out;
+
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
 
- PASSED();
+    PASSED();
 
-/*-------------------------------------------------------------------------
- * attempt to attach a dataset with a group, it should fail
- *-------------------------------------------------------------------------
- */
- TESTING2("attach a dataset with a group");
+    /*-------------------------------------------------------------------------
+    * try to attach a scale to an image, pallete or table
+    *-------------------------------------------------------------------------
+    */
 
- if(H5DSattach_scale(did,gid,0)==SUCCEED)
-  goto out;
+    TESTING2("attach to a dataset that is a reserved class dataset");
 
- PASSED();
+    /* make an image */
+    if(H5IMmake_image_8bit(fid,"image",(hsize_t)100,(hsize_t)50,NULL) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * attempt to set scale for a group, it should fail
- *-------------------------------------------------------------------------
- */
- TESTING2("set scale for a group");
+    /* make a palette */
+    if(H5IMmake_palette(fid,"pallete",pal_dims,NULL) < 0)
+        goto out;
 
- if(H5DSset_scale(gid,"scale 1")==SUCCEED)
-  goto out;
+    /* open the previous written "ds_b" */
+    if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
+        goto out;
 
- PASSED();
+    /* open the image dataset */
+    if((did = H5Dopen2(fid,"image", H5P_DEFAULT)) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * close IDs for this set
- *-------------------------------------------------------------------------
- */
+    /* try to attach "ds_a" to the image, not valid */
+    if(H5DSattach_scale(did,dsid,0)==SUCCEED)
+        goto out;
 
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Sclose(sid) < 0)
-  goto out;
- if(H5Sclose(sidds) < 0)
-  goto out;
- if(H5Gclose(gid) < 0)
-  goto out;
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
 
+    PASSED();
 
-/*-------------------------------------------------------------------------
- * try to attach a scale that has scales
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * is scale
+    *-------------------------------------------------------------------------
+    */
 
- TESTING2("attach a scale that has scales");
+    TESTING2("is scale");
 
- /* create the data space for the scale */
- if((sidds = H5Screate_simple(rankds, s1_dim, NULL)) < 0)
-  goto out;
+    /* open a non scale dataset */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* create a dataset "ds_b" for the scale */
- if((dsid = H5Dcreate2(fid, "ds_b", H5T_NATIVE_INT, sidds, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-  goto out;
+    /* verify that it is not a dimension scale dataset  */
+    if((H5DSis_scale(did))==1)
+        goto out;
 
- /* open the previous written "ds_a" */
- if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
-  goto out;
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
 
- /* attach "ds_b" to "ds_a", valid */
- if(H5DSattach_scale(did, dsid, 0) < 0)
-  goto out;
+    /* open the group. */
+    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Sclose(sidds) < 0)
-  goto out;
+    /* verify that it is not a dimension scale dataset  */
+    if((H5DSis_scale(gid))==1)
+        goto out;
 
- /* open the previous written "dset_a" */
- if((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
-  goto out;
+    /* close */
+    if(H5Gclose(gid) < 0)
+        goto out;
 
-  /* open the previous written "ds_a" */
- if((dsid = H5Dopen2(fid, "ds_a", H5P_DEFAULT)) < 0)
-  goto out;
+    PASSED();
 
- /* try to attach "ds_a" to "dset_a", not valid */
- if(H5DSattach_scale(did,dsid,0)==SUCCEED)
-  goto out;
 
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
+    /*-------------------------------------------------------------------------
+    * detach
+    *-------------------------------------------------------------------------
+    */
 
- /* open the previous written "ds_a" */
- if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
-  goto out;
+    TESTING2("detach scale from dataset it is not attached to");
 
- /* open the previous written "ds_b" */
- if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
-  goto out;
+    /* open the previous written "ds_a" */
+    if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* detach "ds_b" to "ds_a" */
- if(H5DSdetach_scale(did,dsid,0) < 0)
-  goto out;
+    /* open the previous written "dset_a" */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
+    /* try to detach "ds_a" from "dset_a" */
+    if(H5DSdetach_scale(did,dsid,0)==SUCCEED)
+        goto out;
 
- PASSED();
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * try to attach a dataset that is a scale
- *-------------------------------------------------------------------------
- */
+    PASSED();
 
- 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)
-  goto out;
+    /*-------------------------------------------------------------------------
+    * detach
+    *-------------------------------------------------------------------------
+    */
 
- /* open the previous written "ds_a" */
- if((did = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
-  goto out;
+    TESTING2("detach scale from group");
 
- /* try to attach "ds_a" to "ds_b", not valid */
- if(H5DSattach_scale(dsid,did,0)==SUCCEED)
-  goto out;
+    /* open the previous written "ds_a" */
+    if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
+    /* open the group. */
+    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+        goto out;
 
- PASSED();
+    /* try to detach "ds_a" from "grp" */
+    if(H5DSdetach_scale(gid,dsid,0)==SUCCEED)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * try to attach a scale to an image, pallete or table
- *-------------------------------------------------------------------------
- */
+    /* close */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
 
- TESTING2("attach to a dataset that is a reserved class dataset");
+    PASSED();
 
- /* make an image */
- 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)
-  goto out;
+    /*-------------------------------------------------------------------------
+    * detach
+    *-------------------------------------------------------------------------
+    */
 
- /* open the previous written "ds_b" */
- if((dsid = H5Dopen2(fid,"ds_b", H5P_DEFAULT)) < 0)
-  goto out;
+    TESTING2("detach scale when scale is group");
 
- /* open the image dataset */
- if((did = H5Dopen2(fid,"image", H5P_DEFAULT)) < 0)
-  goto out;
+    /* open the previous written "dset_a" */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* try to attach "ds_a" to the image, not valid */
- if(H5DSattach_scale(did,dsid,0)==SUCCEED)
-  goto out;
+    /* open the group. */
+    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
+    /* try to detach "grp" from "dset_a" */
+    if(H5DSdetach_scale(did,gid,0)==SUCCEED)
+        goto out;
 
- PASSED();
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Gclose(gid) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * is scale
- *-------------------------------------------------------------------------
- */
-
- TESTING2("is scale");
-
- /* open a non scale dataset */
- 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)
-  goto out;
-
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
-
- /* open the group. */
- if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* verify that it is not a dimension scale dataset  */
- if((H5DSis_scale(gid))==1)
-  goto out;
-
- /* close */
- if(H5Gclose(gid) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * detach
- *-------------------------------------------------------------------------
- */
-
- 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)
-  goto out;
-
- /* open the previous written "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* try to detach "ds_a" from "dset_a" */
- if(H5DSdetach_scale(did,dsid,0)==SUCCEED)
-  goto out;
-
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * detach
- *-------------------------------------------------------------------------
- */
-
- TESTING2("detach scale from group");
-
- /* open the previous written "ds_a" */
- if((dsid = H5Dopen2(fid,"ds_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* open the group. */
- if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* try to detach "ds_a" from "grp" */
- if(H5DSdetach_scale(gid,dsid,0)==SUCCEED)
-  goto out;
-
- /* close */
- if(H5Dclose(dsid) < 0)
-  goto out;
- if(H5Gclose(gid) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * detach
- *-------------------------------------------------------------------------
- */
+    PASSED();
 
- TESTING2("detach scale when scale is group");
 
- /* open the previous written "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
+    /* close */
+    if(H5Fclose(fid) < 0)
+        goto out;
 
- /* open the group. */
- if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
-  goto out;
+    return 0;
 
- /* try to detach "grp" from "dset_a" */
- if(H5DSdetach_scale(did,gid,0)==SUCCEED)
-  goto out;
-
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Gclose(gid) < 0)
-  goto out;
-
- PASSED();
-
-
- /* close */
- if(H5Fclose(fid) < 0)
-  goto out;
-
- return 0;
-
- /* error zone, gracefully close */
+    /* error zone, gracefully close */
 out:
- H5E_BEGIN_TRY {
-  H5Sclose(sid);
-  H5Sclose(sidds);
-  H5Dclose(did);
-  H5Dclose(dsid);
-  H5Gclose(gid);
-  H5Fclose(fid);
- } H5E_END_TRY;
- H5_FAILED();
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Sclose(sid);
+        H5Sclose(sidds);
+        H5Dclose(did);
+        H5Dclose(dsid);
+        H5Gclose(gid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    H5_FAILED();
+    return FAIL;
 }
 
 
@@ -2084,182 +2080,182 @@ out:
 
 static int test_iterators(void)
 {
- hid_t   fid;                                              /* file ID */
- int     rank     = RANK;                                  /* rank of data dataset */
- int     rankds   = 1;                                     /* rank of DS dataset */
- hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
- hsize_t s1_dim[1]   = {DIM1_SIZE};                        /* size of DS 1 dataset */
- hid_t   gid = -1;                                         /* group ID */
- hid_t   did;                                              /* dataset ID */
- hid_t   dsid;                                             /* scale ID */
- char    dname[30];                                        /* dataset name */
- int     i;
-
- printf("Testing iterators\n");
-
-/*-------------------------------------------------------------------------
- * create a file, spaces, dataset and group ids
- *-------------------------------------------------------------------------
- */
-
- /* create a file using default properties */
- 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)
-  goto out;
- /* make a dataset */
- 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)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * iterate when the dataset has no scales
- *-------------------------------------------------------------------------
- */
-
- TESTING2("iterate when the dataset has no scales ");
-
- /* get the dataset id for "dset_a" */
- 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)
-  goto out;
-
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
+    hid_t   fid;                                              /* file ID */
+    int     rank     = RANK;                                  /* rank of data dataset */
+    int     rankds   = 1;                                     /* rank of DS dataset */
+    hsize_t dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
+    hsize_t s1_dim[1]   = {DIM1_SIZE};                        /* size of DS 1 dataset */
+    hid_t   gid = -1;                                         /* group ID */
+    hid_t   did;                                              /* dataset ID */
+    hid_t   dsid;                                             /* scale ID */
+    char    dname[30];                                        /* dataset name */
+    int     i;
+
+    printf("Testing iterators\n");
+
+    /*-------------------------------------------------------------------------
+    * create a file, spaces, dataset and group ids
+    *-------------------------------------------------------------------------
+    */
+
+    /* create a file using default properties */
+    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)
+        goto out;
+    /* make a dataset */
+    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)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * iterate when the dataset has no scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("iterate when the dataset has no scales ");
+
+    /* get the dataset id for "dset_a" */
+    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)
+        goto out;
+
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * iterate on dimension that is outside the rank
+    *-------------------------------------------------------------------------
+    */
+
+    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)
+        goto out;
+
+    /* try to iterate trough the 3rd dimension of "dset_a", return error */
+    if(H5DSiterate_scales(did,3,NULL,verify_scale,NULL)==SUCCEED)
+        goto out;
+
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * iterate for dimension with many scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("iterate for dimension with many scales ");
+
+    /* open the previously written "dset_a" */
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    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)
+            goto out;
+        /* open */
+        if((dsid = H5Dopen2(fid,dname, H5P_DEFAULT)) < 0)
+            goto out;
+        /* attach */
+        if(H5DSattach_scale(did,dsid,0) < 0)
+            goto out;
+        /* close */
+        if(H5Dclose(dsid) < 0)
+            goto out;
+    }
 
- PASSED();
+    /* iterate trough the 1st dimension of "dset_a" */
+    if(H5DSiterate_scales(did,0,NULL,op_bogus,NULL) < 0)
+        goto out;
 
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
 
-/*-------------------------------------------------------------------------
- * iterate on dimension that is outside the rank
- *-------------------------------------------------------------------------
- */
+    PASSED();
 
- TESTING2("iterate on dimension that is outside the rank ");
+    /*-------------------------------------------------------------------------
+    * iterate on group
+    *-------------------------------------------------------------------------
+    */
 
- /* get the dataset id for "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
+    TESTING2("iterate on group ");
 
- /* try to iterate trough the 3rd dimension of "dset_a", return error */
- if(H5DSiterate_scales(did,3,NULL,verify_scale,NULL)==SUCCEED)
-  goto out;
+    /* open */
+    if((gid = H5Gopen2(fid, "grp", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
+    /* try to iterate, return error */
+    if(H5DSiterate_scales(gid,0,NULL,verify_scale,NULL)==SUCCEED)
+        goto out;
 
- PASSED();
-
-/*-------------------------------------------------------------------------
- * iterate for dimension with many scales
- *-------------------------------------------------------------------------
- */
+    /* close */
+    if(H5Gclose(gid) < 0)
+        goto out;
 
- TESTING2("iterate for dimension with many scales ");
-
- /* open the previously written "dset_a" */
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- 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)
-   goto out;
-  /* open */
-  if((dsid = H5Dopen2(fid,dname, H5P_DEFAULT)) < 0)
-   goto out;
-  /* attach */
-  if(H5DSattach_scale(did,dsid,0) < 0)
-   goto out;
-  /* close */
-  if(H5Dclose(dsid) < 0)
-   goto out;
- }
-
- /* iterate trough the 1st dimension of "dset_a" */
- if(H5DSiterate_scales(did,0,NULL,op_bogus,NULL) < 0)
-  goto out;
-
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
+    PASSED();
 
-/*-------------------------------------------------------------------------
- * iterate on group
- *-------------------------------------------------------------------------
- */
 
- TESTING2("iterate on group ");
-
- /* open */
- 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)
-  goto out;
-
- /* close */
- if(H5Gclose(gid) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * iterate in deleted scales
- *-------------------------------------------------------------------------
- */
+    /*-------------------------------------------------------------------------
+    * iterate in deleted scales
+    *-------------------------------------------------------------------------
+    */
 
- TESTING2("iterate in deleted scales ");
+    TESTING2("iterate in deleted scales ");
 
- if(H5Ldelete(fid, "ds_0", H5P_DEFAULT) < 0)
-  goto out;
+    if(H5Ldelete(fid, "ds_0", H5P_DEFAULT) < 0)
+        goto out;
 
- /* open the previously written "dset_a" */
- if((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
-  goto out;
+    /* open the previously written "dset_a" */
+    if((did = H5Dopen2(fid, "dset_a", H5P_DEFAULT)) < 0)
+        goto out;
 
- /* iterate  */
- if(H5DSiterate_scales(did, 0, NULL, op_bogus, NULL) == SUCCEED)
-  goto out;
+    /* iterate  */
+    if(H5DSiterate_scales(did, 0, NULL, op_bogus, NULL) == SUCCEED)
+        goto out;
 
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
 
- PASSED();
+    PASSED();
 
 
- /* close */
- if(H5Fclose(fid) < 0)
-  goto out;
+    /* close */
+    if(H5Fclose(fid) < 0)
+        goto out;
 
- return 0;
+    return 0;
 
- /* error zone, gracefully close */
+    /* error zone, gracefully close */
 out:
- H5E_BEGIN_TRY {
-  H5Gclose(gid);
-  H5Fclose(fid);
- } H5E_END_TRY;
- H5_FAILED();
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Gclose(gid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    H5_FAILED();
+    return FAIL;
 }
 
 
@@ -2270,204 +2266,204 @@ out:
 
 static int test_rank(void)
 {
- hid_t   fid;                                              /* file ID */
- hid_t   did = -1;                                         /* dataset ID */
- hid_t   dsid = -1;                                        /* scale ID */
- hid_t   sid;                                              /* space ID */
- hid_t   sidds;                                            /* space ID */
- hsize_t dims1[1]  = {DIM1_SIZE};                          /* size of data dataset */
- hsize_t dims2[2]  = {DIM1_SIZE,DIM2_SIZE};                /* size of data dataset */
- hsize_t dims3[3]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE};      /* size of data dataset */
- hsize_t dimss[2]  = {1,1};                                /* size of data dataset */
- char    name[30];                                         /* dataset name buffer */
- char    names[30];                                        /* dataset scale name buffer */
- char    namel[30];                                        /* dataset label name buffer */
- int     bufi[1]={2};
- float   buff[1]={1};
- int     i;
-
- printf("Testing ranks\n");
-
-/*-------------------------------------------------------------------------
- * create a file, a dataset, scales
- *-------------------------------------------------------------------------
- */
-
- /* create a file using default properties */
- 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)
-  goto out;
-
- /* make a 1D scale dataset  */
- 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)
-  goto out;
-
- /* make a 3D scale dataset  */
- if(H5LTmake_dataset_int(fid,"ds_a_2",3,dims3,NULL) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach
- *-------------------------------------------------------------------------
- */
-
- TESTING2("attach");
-
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- for(i=0; i<3; i++)
- {
-  sprintf(name,"ds_a_%d",i);
-  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
-   goto out;
-  if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
-   goto out;
-  if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
-   goto out;
-  if(H5Dclose(dsid) < 0)
-   goto out;
- }
-
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-
-/*-------------------------------------------------------------------------
- * detach
- *-------------------------------------------------------------------------
- */
-
- TESTING2("detach");
-
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- for(i=0; i<3; i++)
- {
-  sprintf(name,"ds_a_%d",i);
-  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
-   goto out;
-  if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
-   goto out;
-  if(H5DSis_attached(did,dsid,(unsigned)i)!=0)
-   goto out;
-  if(H5Dclose(dsid) < 0)
-   goto out;
- }
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * attach, set, get names, labels
- *-------------------------------------------------------------------------
- */
-
- TESTING2("attach, set, get names, labels");
-
- if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
-  goto out;
-
- for(i=0; i<3; i++)
- {
-  sprintf(name,"ds_a_%d",i);
-  if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
-   goto out;
-  if(H5DSset_scale(dsid,name) < 0)
-   goto out;
-  if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
-   goto out;
-  if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
-   goto out;
-  if(H5DSget_scale_name(dsid,names,sizeof(names)) < 0)
-   goto out;
-  if(H5Dclose(dsid) < 0)
-   goto out;
-  if(H5DSset_label(did,(unsigned)i,name) < 0)
-   goto out;
-  if(H5DSget_label(did,(unsigned)i,namel,sizeof(namel)) < 0)
-   goto out;
-  if(strcmp(name,names)!=0)
-   goto out;
-  if(strcmp(name,namel)!=0)
-   goto out;
- }
-
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * attach a scalar scale
- *-------------------------------------------------------------------------
- */
-
- TESTING2("attach a scalar scale");
-
- /* create the data space for the dataset */
- if((sid = H5Screate_simple(2, dimss, NULL)) < 0)
-  goto out;
- /* create a dataset of rank 2 */
- 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)
-  goto out;
- /* create a dataset of scalar rank for the scale */
- 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)
-  goto out;
- if(H5Dwrite(dsid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buff) < 0)
-  goto out;
- /* attach */
- if(H5DSattach_scale(did, dsid, 0) < 0)
-  goto out;
- if(H5DSattach_scale(did, dsid, 1) < 0)
-  goto out;
- /* close */
- if(H5Sclose(sid) < 0)
-  goto out;
- if(H5Sclose(sidds) < 0)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Dclose(dsid) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
- if(H5Fclose(fid) < 0)
-  goto out;
-
- return 0;
-
- /* error zone, gracefully close */
+    hid_t   fid;                                              /* file ID */
+    hid_t   did = -1;                                         /* dataset ID */
+    hid_t   dsid = -1;                                        /* scale ID */
+    hid_t   sid;                                              /* space ID */
+    hid_t   sidds;                                            /* space ID */
+    hsize_t dims1[1]  = {DIM1_SIZE};                          /* size of data dataset */
+    hsize_t dims2[2]  = {DIM1_SIZE,DIM2_SIZE};                /* size of data dataset */
+    hsize_t dims3[3]  = {DIM1_SIZE,DIM2_SIZE,DIM3_SIZE};      /* size of data dataset */
+    hsize_t dimss[2]  = {1,1};                                /* size of data dataset */
+    char    name[30];                                         /* dataset name buffer */
+    char    names[30];                                        /* dataset scale name buffer */
+    char    namel[30];                                        /* dataset label name buffer */
+    int     bufi[1]={2};
+    float   buff[1]={1};
+    int     i;
+
+    printf("Testing ranks\n");
+
+    /*-------------------------------------------------------------------------
+    * create a file, a dataset, scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* create a file using default properties */
+    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)
+        goto out;
+
+    /* make a 1D scale dataset  */
+    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)
+        goto out;
+
+    /* make a 3D scale dataset  */
+    if(H5LTmake_dataset_int(fid,"ds_a_2",3,dims3,NULL) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach");
+
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    for(i=0; i<3; i++)
+    {
+        sprintf(name,"ds_a_%d",i);
+        if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
+            goto out;
+        if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
+            goto out;
+        if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
+            goto out;
+        if(H5Dclose(dsid) < 0)
+            goto out;
+    }
+
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+
+    /*-------------------------------------------------------------------------
+    * detach
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("detach");
+
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    for(i=0; i<3; i++)
+    {
+        sprintf(name,"ds_a_%d",i);
+        if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
+            goto out;
+        if(H5DSdetach_scale(did,dsid,(unsigned)i) < 0)
+            goto out;
+        if(H5DSis_attached(did,dsid,(unsigned)i)!=0)
+            goto out;
+        if(H5Dclose(dsid) < 0)
+            goto out;
+    }
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * attach, set, get names, labels
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach, set, get names, labels");
+
+    if((did = H5Dopen2(fid,"dset_a", H5P_DEFAULT)) < 0)
+        goto out;
+
+    for(i=0; i<3; i++)
+    {
+        sprintf(name,"ds_a_%d",i);
+        if((dsid = H5Dopen2(fid,name, H5P_DEFAULT)) < 0)
+            goto out;
+        if(H5DSset_scale(dsid,name) < 0)
+            goto out;
+        if(H5DSattach_scale(did,dsid,(unsigned)i) < 0)
+            goto out;
+        if(H5DSis_attached(did,dsid,(unsigned)i)<=0)
+            goto out;
+        if(H5DSget_scale_name(dsid,names,sizeof(names)) < 0)
+            goto out;
+        if(H5Dclose(dsid) < 0)
+            goto out;
+        if(H5DSset_label(did,(unsigned)i,name) < 0)
+            goto out;
+        if(H5DSget_label(did,(unsigned)i,namel,sizeof(namel)) < 0)
+            goto out;
+        if(strcmp(name,names)!=0)
+            goto out;
+        if(strcmp(name,namel)!=0)
+            goto out;
+    }
+
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * attach a scalar scale
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("attach a scalar scale");
+
+    /* create the data space for the dataset */
+    if((sid = H5Screate_simple(2, dimss, NULL)) < 0)
+        goto out;
+    /* create a dataset of rank 2 */
+    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)
+        goto out;
+    /* create a dataset of scalar rank for the scale */
+    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)
+        goto out;
+    if(H5Dwrite(dsid, H5T_NATIVE_FLOAT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buff) < 0)
+        goto out;
+    /* attach */
+    if(H5DSattach_scale(did, dsid, 0) < 0)
+        goto out;
+    if(H5DSattach_scale(did, dsid, 1) < 0)
+        goto out;
+    /* close */
+    if(H5Sclose(sid) < 0)
+        goto out;
+    if(H5Sclose(sidds) < 0)
+        goto out;
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Dclose(dsid) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    if(H5Fclose(fid) < 0)
+        goto out;
+
+    return 0;
+
+    /* error zone, gracefully close */
 out:
- H5E_BEGIN_TRY {
-  H5Dclose(did);
-  H5Dclose(dsid);
-  H5Fclose(fid);
- } H5E_END_TRY;
- H5_FAILED();
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Dclose(dsid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    H5_FAILED();
+    return FAIL;
 }
 
 
@@ -2478,173 +2474,173 @@ out:
 
 static int test_types(void)
 {
- hid_t          fid;                                              /* file ID */
- hid_t          did = -1;                                         /* dataset ID */
- hid_t          dsid = -1;                                        /* DS dataset ID */
- int            rank     = RANK;                                  /* rank of data dataset */
- int            rankds   = 1;                                     /* rank of DS dataset */
- hsize_t        dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
- int            buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
- hsize_t        s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
- hsize_t        s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
- float          s1_float[DIM1_SIZE] = {10,20,30};                 /* data of DS 1 dataset */
- unsigned short s2_ushort[DIM2_SIZE] = {10,20,30,40};             /* data of DS 2 dataset */
- const char     *s1_str = "ABC";
- const char     *s2_str = "ABCD";
-
- printf("Testing scales with several datatypes\n");
-
-/*-------------------------------------------------------------------------
- * create a file for the test
- *-------------------------------------------------------------------------
- */
- /* create a file using default properties */
- if((fid=H5Fcreate(FILE5,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * create datasets: 1 "data" dataset and 2 dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* make a dataset */
- 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)
-  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)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * floating point and short scales
- *-------------------------------------------------------------------------
- */
-
- TESTING2("floating point and short scales");
-
- /* get the dataset id for "dset_a" */
- 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)
-  goto out;
- /* attach the DS_1_NAME dimension scale to "dset_a" at dimension 0 */
- if(H5DSattach_scale(did,dsid,DIM0) < 0)
-  goto out;
- /* set name */
- if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
-  goto out;
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
- /* get the DS dataset id */
- 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)
-  goto out;
- /* set name */
- if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
-  goto out;
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
- /* set a label */
- if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
-  goto out;
- if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
-  goto out;
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * create datasets: 1 "data" dataset and 2 dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* make a dataset */
- 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)
-  goto out;
-
- /* make a DS dataset for the second dimension */
- if(H5LTmake_dataset_string(fid,"ds_b_2",s2_str) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * floating point and short scales
- *-------------------------------------------------------------------------
- */
-
- TESTING2("string scales");
-
- /* get the dataset id for "dset_b" */
- 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)
-  goto out;
- /* attach the DS_1_NAME dimension scale to "dset_b" at dimension 0 */
- if(H5DSattach_scale(did,dsid,DIM0) < 0)
-  goto out;
- /* set name */
- if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
-  goto out;
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
- /* get the DS dataset id */
- 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)
-  goto out;
- /* set name */
- if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
-  goto out;
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
- /* set a label */
- if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
-  goto out;
- if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
-  goto out;
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
- if(H5Fclose(fid) < 0)
-  goto out;
-
- return 0;
-
- /* error zone, gracefully close */
+    hid_t          fid;                                              /* file ID */
+    hid_t          did = -1;                                         /* dataset ID */
+    hid_t          dsid = -1;                                        /* DS dataset ID */
+    int            rank     = RANK;                                  /* rank of data dataset */
+    int            rankds   = 1;                                     /* rank of DS dataset */
+    hsize_t        dims[RANK]  = {DIM1_SIZE,DIM2_SIZE};              /* size of data dataset */
+    int            buf[DIM_DATA] = {1,2,3,4,5,6,7,8,9,10,11,12};     /* data of data dataset */
+    hsize_t        s1_dim[1]  = {DIM1_SIZE};                         /* size of DS 1 dataset */
+    hsize_t        s2_dim[1]  = {DIM2_SIZE};                         /* size of DS 2 dataset */
+    float          s1_float[DIM1_SIZE] = {10,20,30};                 /* data of DS 1 dataset */
+    unsigned short s2_ushort[DIM2_SIZE] = {10,20,30,40};             /* data of DS 2 dataset */
+    const char     *s1_str = "ABC";
+    const char     *s2_str = "ABCD";
+
+    printf("Testing scales with several datatypes\n");
+
+    /*-------------------------------------------------------------------------
+    * create a file for the test
+    *-------------------------------------------------------------------------
+    */
+    /* create a file using default properties */
+    if((fid=H5Fcreate(FILE5,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * create datasets: 1 "data" dataset and 2 dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* make a dataset */
+    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)
+        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)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * floating point and short scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("floating point and short scales");
+
+    /* get the dataset id for "dset_a" */
+    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)
+        goto out;
+    /* attach the DS_1_NAME dimension scale to "dset_a" at dimension 0 */
+    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+        goto out;
+    /* set name */
+    if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
+        goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    /* get the DS dataset id */
+    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)
+        goto out;
+    /* set name */
+    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+        goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    /* set a label */
+    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+        goto out;
+    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+        goto out;
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * create datasets: 1 "data" dataset and 2 dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* make a dataset */
+    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)
+        goto out;
+
+    /* make a DS dataset for the second dimension */
+    if(H5LTmake_dataset_string(fid,"ds_b_2",s2_str) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * floating point and short scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("string scales");
+
+    /* get the dataset id for "dset_b" */
+    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)
+        goto out;
+    /* attach the DS_1_NAME dimension scale to "dset_b" at dimension 0 */
+    if(H5DSattach_scale(did,dsid,DIM0) < 0)
+        goto out;
+    /* set name */
+    if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
+        goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    /* get the DS dataset id */
+    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)
+        goto out;
+    /* set name */
+    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+        goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    /* set a label */
+    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+        goto out;
+    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+        goto out;
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+    /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    if(H5Fclose(fid) < 0)
+        goto out;
+
+    return 0;
+
+    /* error zone, gracefully close */
 out:
- H5E_BEGIN_TRY {
-  H5Dclose(did);
-  H5Dclose(dsid);
-  H5Fclose(fid);
- } H5E_END_TRY;
- H5_FAILED();
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Dclose(dsid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    H5_FAILED();
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
@@ -2654,149 +2650,162 @@ out:
 
 static int test_data(void)
 {
- hid_t   fid;                         /* file ID */
- hid_t   did = -1;                    /* dataset ID */
- hid_t   dsid = -1;                   /* DS dataset ID */
- hid_t   dcpl;                        /* dataset creation property list */
- hid_t   sid;                         /* dataspace ID */
- float   *vals=NULL;                  /* array to hold data values */
- float   *latbuf=NULL;                /* array to hold the latitude values */
- float   *lonbuf=NULL;                /* array to hold the longitude values */
- hsize_t dims[2];                     /* array to hold dimensions */
- hsize_t latdims[1];                  /* array to hold dimensions */
- hsize_t londims[1];                  /* array to hold dimensions */
- float   fill=-99;                    /* fill value */
-
-
- printf("Testing reading ASCII data and generate HDF5 data with scales\n");
-
-/*-------------------------------------------------------------------------
- * create a file for the test
- *-------------------------------------------------------------------------
- */
- /* create a file using default properties */
- if((fid=H5Fcreate(FILE6,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * read data
- *-------------------------------------------------------------------------
- */
-
- /* read ASCII bathymetry data */
- if(read_data("dsdata.txt",2,dims,&vals) < 0)
-  goto out;
-
- /* read the latitude */
- if(read_data("dslat.txt",1,latdims,&latbuf) < 0)
-  goto out;
-
- /* read the longitude */
- if(read_data("dslon.txt",1,londims,&lonbuf) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * generating scales
- *-------------------------------------------------------------------------
- */
-
- TESTING2("generating scales");
-
-/*-------------------------------------------------------------------------
- * create datasets: 1 "data" dataset and 2 dimension scales
- *-------------------------------------------------------------------------
- */
-
- /* make a DS dataset for the first dimension */
- 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)
-  goto out;
-
- /* make a dataset for the data. a fill value is set */
- if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
-  goto out;
- if(H5Pset_fill_value(dcpl, H5T_NATIVE_FLOAT, &fill) < 0)
-  goto out;
- if((sid = H5Screate_simple(2, dims, NULL)) < 0)
-  goto out;
- 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)
-  goto out;
- if(H5Dclose(did) < 0)
-  goto out;
- if(H5Pclose(dcpl) < 0)
-  goto out;
- if(H5Sclose(sid) < 0)
-  goto out;
-
-/*-------------------------------------------------------------------------
- * attach
- *-------------------------------------------------------------------------
- */
-
- /* get the dataset id for "data" */
- if((did = H5Dopen2(fid,"data", H5P_DEFAULT)) < 0)
-  goto out;
-
- /* get the DS dataset id */
- 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)
-  goto out;
- /* set name */
- if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
-  goto out;
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
- /* get the DS dataset id */
- 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)
-  goto out;
- /* set name */
- if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
-  goto out;
- /* close DS id */
- if(H5Dclose(dsid) < 0)
-  goto out;
- /* set a label */
- if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
-  goto out;
- if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
-  goto out;
- /* close */
- if(H5Dclose(did) < 0)
-  goto out;
-
- PASSED();
-
-
-
-/*-------------------------------------------------------------------------
- * close
- *-------------------------------------------------------------------------
- */
- if(H5Fclose(fid) < 0)
-  goto out;
-
- return 0;
-
- /* error zone, gracefully close */
+    hid_t   fid;                         /* file ID */
+    hid_t   did = -1;                    /* dataset ID */
+    hid_t   dsid = -1;                   /* DS dataset ID */
+    hid_t   dcpl;                        /* dataset creation property list */
+    hid_t   sid;                         /* dataspace ID */
+    float   *vals=NULL;                  /* array to hold data values */
+    float   *latbuf=NULL;                /* array to hold the latitude values */
+    float   *lonbuf=NULL;                /* array to hold the longitude values */
+    hsize_t dims[2];                     /* array to hold dimensions */
+    hsize_t latdims[1];                  /* array to hold dimensions */
+    hsize_t londims[1];                  /* array to hold dimensions */
+    float   fill=-99;                    /* fill value */
+
+
+    printf("Testing reading ASCII data and generate HDF5 data with scales\n");
+
+    /*-------------------------------------------------------------------------
+    * create a file for the test
+    *-------------------------------------------------------------------------
+    */
+    /* create a file using default properties */
+    if((fid=H5Fcreate(FILE6,H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT)) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * generating scales
+    *-------------------------------------------------------------------------
+    */
+
+    TESTING2("generating scales");
+
+    /*-------------------------------------------------------------------------
+    * create datasets: 1 "data" dataset and 2 dimension scales
+    *-------------------------------------------------------------------------
+    */
+
+    /* read the latitude */
+    if(read_data("dslat.txt",1,latdims,&latbuf) < 0)
+        goto out;
+
+    /* make a DS dataset for the first dimension */
+    if(H5LTmake_dataset_float(fid, "lat", 1, latdims, latbuf) < 0)
+        goto out;
+
+    free( latbuf );
+    latbuf = NULL;
+
+     /* read the longitude */
+    if(read_data("dslon.txt",1,londims,&lonbuf) < 0)
+        goto out;
+
+    /* make a DS dataset for the second dimension */
+    if(H5LTmake_dataset_float(fid, "lon", 1, londims, lonbuf) < 0)
+        goto out;
+
+    free( lonbuf );
+    lonbuf = NULL;
+
+    /* make a dataset for the data. a fill value is set */
+    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        goto out;
+    if(H5Pset_fill_value(dcpl, H5T_NATIVE_FLOAT, &fill) < 0)
+        goto out;
+    
+    /* read ASCII bathymetry data and dimensions to create dataset */
+    if(read_data("dsdata.txt",2,dims,&vals) < 0)
+        goto out;
+
+    if((sid = H5Screate_simple(2, dims, NULL)) < 0)
+        goto out;
+    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)
+        goto out;
+
+    free ( vals );
+    vals = NULL;
+
+    if(H5Dclose(did) < 0)
+        goto out;
+    if(H5Pclose(dcpl) < 0)
+        goto out;
+    if(H5Sclose(sid) < 0)
+        goto out;
+
+    /*-------------------------------------------------------------------------
+    * attach
+    *-------------------------------------------------------------------------
+    */
+
+    /* get the dataset id for "data" */
+    if((did = H5Dopen2(fid,"data", H5P_DEFAULT)) < 0)
+        goto out;
+
+    /* get the DS dataset id */
+    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)
+        goto out;
+    /* set name */
+    if(H5DSset_scale(dsid,SCALE_1_NAME) < 0)
+        goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    /* get the DS dataset id */
+    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)
+        goto out;
+    /* set name */
+    if(H5DSset_scale(dsid,SCALE_2_NAME) < 0)
+        goto out;
+    /* close DS id */
+    if(H5Dclose(dsid) < 0)
+        goto out;
+    /* set a label */
+    if(H5DSset_label(did,DIM0,DIM0_LABEL) < 0)
+        goto out;
+    if(H5DSset_label(did,DIM1,DIM1_LABEL) < 0)
+        goto out;
+    /* close */
+    if(H5Dclose(did) < 0)
+        goto out;
+
+    PASSED();
+
+
+
+    /*-------------------------------------------------------------------------
+    * close
+    *-------------------------------------------------------------------------
+    */
+    if(H5Fclose(fid) < 0)
+        goto out;
+
+    return 0;
+
+    /* error zone, gracefully close */
 out:
- H5E_BEGIN_TRY {
-  H5Dclose(did);
-  H5Dclose(dsid);
-  H5Fclose(fid);
- } H5E_END_TRY;
- H5_FAILED();
- return FAIL;
+    H5E_BEGIN_TRY {
+        H5Dclose(did);
+        H5Dclose(dsid);
+        H5Fclose(fid);
+    } H5E_END_TRY;
+    H5_FAILED();
+
+    if (latbuf)
+        free( latbuf );
+    if (lonbuf)
+        free( lonbuf );
+    if (vals)
+        free( vals );
+    return FAIL;
 }
 
 
@@ -2814,52 +2823,61 @@ out:
  *-------------------------------------------------------------------------
  */
 
-static int read_data( const char* fname, int ndims, hsize_t *dims, float **buf )
+static int read_data( const char* fname, 
+                      int ndims, 
+                      hsize_t *dims, 
+                      float **buf )
 {
- int      i, n;
- unsigned j;
- char     str[20];
- size_t   nelms;
- FILE     *f;
- float    val;
- char     *srcdir = getenv("srcdir");  /* the source directory */
- char     data_file[512];              /* buffer to hold name of existing data file */
-
- strcpy(data_file, "");
- /* compose the name of the file to open, using the srcdir, if appropriate */
- if(srcdir)
- {
-  strcpy(data_file, srcdir);
-  strcat(data_file, "/");
- }
- /* read first data file */
- strcat(data_file,fname);
-
- f = fopen(data_file, "r");
- if( f == NULL )
- {
-  printf( "Could not open file %s\n", data_file );
-  return -1;
- }
-
- for(i=0, nelms=1; i < ndims; i++)
- {
-  fscanf( f, "%s %u", str, &j);
-  fscanf( f, "%d",&n );
-  dims[i] = n;
-  nelms *= n;
- }
-
- *buf = (float*) malloc (nelms * sizeof( float ));
-
- for(j = 0; j < nelms; j++)
- {
-  fscanf( f, "%f",&val );
-  (*buf)[j] = val;
- }
- fclose(f);
-
- return 1;
+    int      i, n;
+    unsigned j;
+    char     str[20];
+    size_t   nelms;
+    FILE     *f;
+    float    val;
+    char     *srcdir = getenv("srcdir");  /* the source directory */
+    char     data_file[512];              /* buffer to hold name of existing data file */
+
+    strcpy(data_file, "");
+    /* compose the name of the file to open, using the srcdir, if appropriate */
+    if(srcdir)
+    {
+        strcpy(data_file, srcdir);
+        strcat(data_file, "/");
+    }
+    /* read first data file */
+    strcat(data_file,fname);
+
+    f = fopen(data_file, "r");
+    if( f == NULL )
+    {
+        printf( "Could not open file %s\n", data_file );
+        return -1;
+    }
+
+    for(i=0, nelms=1; i < ndims; i++)
+    {
+        fscanf( f, "%s %u", str, &j);
+        fscanf( f, "%d",&n );
+        dims[i] = n;
+        nelms *= n;
+    }
+
+    *buf = (float*) malloc (nelms * sizeof( float ));
+
+    if ( *buf == NULL )
+    {
+        printf( "memory allocation failed\n" );
+        return -1;
+    }
+
+    for(j = 0; j < nelms; j++)
+    {
+        fscanf( f, "%f",&val );
+        (*buf)[j] = val;
+    }
+    fclose(f);
+
+    return 1;
 
 }