[svn-r15628] Description:

    Remove trailing whitespace from C/C++ source files, with the following
script:

    foreach f (*.[ch] *.cpp)
        sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
    end

Tested on:
    Mac OS X/32 10.5.5 (amazon)
    No need for h5committest, just whitespace changes...

12 files changed, 377 insertions, 377 deletions

diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 271cc87..37718b9 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -972,7 +972,7 @@ nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
   size_t c_bufsize;
   char *c_buf=NULL;           /* Buffer to hold C string */
   int_f ret_value=0;          /* Return value */
-    
+
   c_bufsize = (size_t)*bufsize+1;
   /*
    * Allocate buffer to hold name of an attribute
@@ -983,7 +983,7 @@ nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
   /*
    * Call H5Aget_name function
    */
-  
+
   if ((ret_value = (int_f)H5Aget_name((hid_t)*attr_id, c_bufsize, c_buf)) < 0)
     HGOTO_DONE(FAIL);
 
@@ -1022,7 +1022,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aget_create_plist_c
- * Purpose:     Call H5Aget_create_plist 
+ * Purpose:     Call H5Aget_create_plist
  * Inputs:      attr_id - identifier of an attribute
  * Outputs:     creation_prop_id - Identifier for the attribute’s creation property
  * Returns:     0 on success, -1 on failure
@@ -1046,8 +1046,8 @@ done:
 /*----------------------------------------------------------------------------
  * Name:      h5arename_by_name_c
  * Purpose:   Calls H5Arename_by_name
- * Inputs:    loc_id        - Object identifier 
- *            obj_name      - Name of object, relative to location, 
+ * Inputs:    loc_id        - Object identifier
+ *            obj_name      - Name of object, relative to location,
  *                             whose attribute is to be renamed
  *            obj_name_len      - Object name length
  *            old_attr_name     - Prior attribute name
@@ -1063,9 +1063,9 @@ done:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen, 
+		      _fcd new_attr_name, size_t_f *new_attr_namelen,
 		      hid_t_f *lapl_id )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1076,9 +1076,9 @@ nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
       * Convert FORTRAN name to C name
       */
     if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-      HGOTO_DONE(FAIL);  
+      HGOTO_DONE(FAIL);
     if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
-      HGOTO_DONE(FAIL);  
+      HGOTO_DONE(FAIL);
     if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
       HGOTO_DONE(FAIL);
 
@@ -1132,15 +1132,15 @@ done:
     return ret_value;
 }
 /*----------------------------------------------------------------------------
- * Name:        h5adelete_by_name_c 
- * Purpose:     Call h5adelete_by_name to remove an attribute from a specified location 
+ * Name:        h5adelete_by_name_c
+ * Purpose:     Call h5adelete_by_name to remove an attribute from a specified location
  * Inputs:      loc_id - identifer for object to which attribute is attached
  *              obj_name - object identifier
  *              obj_namelen - name length
  *              attr_name - name of the attribute
  *              attr_namelen - name length
  *              lapl_id - link access property list
- *              
+ *
  * Outputs:     N/A
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1158,7 +1158,7 @@ nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fc
       * Convert FORTRAN name to C name
       */
     if((c_obj_name = HD5f2cstring(obj_name, (size_t)*obj_namelen)) == NULL)
-      HGOTO_DONE(FAIL);  
+      HGOTO_DONE(FAIL);
     if((c_attr_name = HD5f2cstring(attr_name, (size_t)*attr_namelen)) == NULL)
       HGOTO_DONE(FAIL);
 
@@ -1176,15 +1176,15 @@ done:
     return ret_value;
 }
 /*----------------------------------------------------------------------------
- * Name:        h5adelete_by_idx_c 
- * Purpose:     Call h5adelete_by_idx 
- * Inputs:      loc_id - Location or object identifier; may be dataset or group 
+ * Name:        h5adelete_by_idx_c
+ * Purpose:     Call h5adelete_by_idx
+ * Inputs:      loc_id - Location or object identifier; may be dataset or group
  *              obj_name - object identifier
  *              obj_namelen - name length
  *              attr_name - name of the attribute
  *              attr_namelen - name length
  *              lapl_id - link access property list
- *              
+ *
  * Outputs:     N/A
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1192,7 +1192,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1210,7 +1210,7 @@ nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
     c_order = (H5_iter_order_t)*order;
 
      /*
-      * Call H5Adelete_by_name function. 
+      * Call H5Adelete_by_name function.
       */
 
     if(H5Adelete_by_idx((hid_t)*loc_id, c_obj_name, c_idx_type, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
@@ -1244,13 +1244,13 @@ done:
  *                          H5_ITER_N	     - Number of iteration orders
  *
  *            n  - Attribute’s position in index
- *      attr_id  - Attribute identifier 
+ *      attr_id  - Attribute identifier
  *         size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
- *   
+ *
  *     lapl_id   - Link access property list
  *      hdferr   - Error code:
  *                            Returns attribute name size, -1 if fail
- *              
+ *
  * Outputs:     name - Attribute name
  *
  * Returns:     Size of buffer on success, -1 on failure
@@ -1259,8 +1259,8 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-		       int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name, 
+nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		       int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
 		       size_t_f *size, hid_t_f *lapl_id)
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1282,7 +1282,7 @@ nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
     /*
      * Allocate buffer to hold name of an attribute
      */
-    c_buf_size = (size_t)*size + 1; 
+    c_buf_size = (size_t)*size + 1;
     c_buf = (char *)HDmalloc(c_buf_size);
     if (c_buf == NULL) return ret_value;
      /*
@@ -1308,7 +1308,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aopen_by_idx_c
- * Purpose:     Call H5Aopen_by_idx 
+ * Purpose:     Call H5Aopen_by_idx
  * Inputs:   loc_id    - Object identifier
  *            obj_name - Name of object to which attribute is attached
  *         obj_namelen - name length
@@ -1324,7 +1324,7 @@ done:
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
- *                
+ *
  *                   n - Attribute’s position in index
  *             aapl_id - Attribute access property list
  *             lapl_id - Link access property list
@@ -1335,7 +1335,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		   int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1367,8 +1367,8 @@ done:
  * Name:        h5aget_info_c
  * Purpose:     Call H5Aget_info
  * Inputs:     loc_id  - Object identifier
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -1379,7 +1379,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder, 
+nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
 		int_f *cset, hsize_t_f *data_size )
 {
 
@@ -1424,11 +1424,11 @@ done:
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
- *                
+ *
  *                   n - Attribute’s position in index
  *             lapl_id - Link access property list
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -1439,9 +1439,9 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-		int_f *corder_valid, int_f *corder, 
+		int_f *corder_valid, int_f *corder,
 		int_f *cset, hsize_t_f *data_size )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1487,8 +1487,8 @@ done:
  *           attr_name - Attribute name
  *        attr_namelen - attribute name length
  *             lapl_id - Link access property list
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -1501,7 +1501,7 @@ done:
 int_f
 nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 			_fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
-			int_f *corder_valid, int_f *corder, 
+			int_f *corder_valid, int_f *corder,
 			int_f *cset, hsize_t_f *data_size )
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -1553,8 +1553,8 @@ done:
  *         aapl_id - Attribute access property list identifier (Currently not used.)
  *         lapl_id - Link access property list
  *
- * Outputs:   
- *            attr - an attribute identifier 
+ * Outputs:
+ *            attr - an attribute identifier
  *
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1596,7 +1596,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aexists_c
- * Purpose:     CAll h5aexists 
+ * Purpose:     CAll h5aexists
  * Inputs:
  *             obj_id - Object identifier
  *          attr_name - Attribute name
@@ -1633,7 +1633,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aexists_by_name_c
- * Purpose:     CAll H5Aexists_by_name 
+ * Purpose:     CAll H5Aexists_by_name
  * Inputs:
  *     loc_id - Location identifier
  *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
@@ -1647,7 +1647,7 @@ done:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
 		      hid_t_f *lapl_id, int_f *attr_exists)
 {
   char *c_obj_name = NULL;          /* Buffer to hold object name C string */
@@ -1678,7 +1678,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5aopen_by_name_c
- * Purpose:     Call H5Aopen_by_name 
+ * Purpose:     Call H5Aopen_by_name
  * Inputs:
  *     loc_id - Location identifier
  *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
@@ -1693,7 +1693,7 @@ done:
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
+nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
 		    hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
 {
   char *c_obj_name = NULL;          /* Buffer to hold object name C string */
@@ -1738,7 +1738,7 @@ nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5arename_c( hid_t_f *loc_id, 
+nh5arename_c( hid_t_f *loc_id,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
 		      _fcd new_attr_name, size_t_f *new_attr_namelen)
 {
@@ -1747,9 +1747,9 @@ nh5arename_c( hid_t_f *loc_id,
   int_f ret_value=0;          /* Return value */
   /*
    * Convert FORTRAN name to C name
-   */ 
+   */
   if((c_old_attr_name = HD5f2cstring(old_attr_name, (size_t)*old_attr_namelen)) == NULL)
-    HGOTO_DONE(FAIL);  
+    HGOTO_DONE(FAIL);
   if((c_new_attr_name = HD5f2cstring(new_attr_name, (size_t)*new_attr_namelen)) == NULL)
     HGOTO_DONE(FAIL);
 
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index fab2eb5..58f3ce2 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -30,12 +30,12 @@
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, August 4, 1999
- * Modifications: 
+ * Modifications:
  *               - Added optional parameters introduced in version 1.8
  *                 February, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, 
+nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
 	      hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 {
      char *c_name = NULL;
@@ -51,7 +51,7 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_
      /*
       * Call H5Dcreate2 function.
       */
-     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, 
+     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id,
 				(hid_t)*lcpl_id, (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
          goto DONE;
      *dset_id = (hid_t_f)c_dset_id;
@@ -119,7 +119,7 @@ DONE:
  *              Tuesday, May 14, 2002
  * Modifications: This function is added to accomodate oveloaded h5dwrite_f
  *                with the dims argument being of INTEGER(HSIZE_T) type
- 
+
  *---------------------------------------------------------------------------*/
 int_f
 nh5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
@@ -257,7 +257,7 @@ nh5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, h
  *                complains about wrong parameter types in h5dwrite_c function
  *                called by Fortran rouitnes
  *                                           October 10, 2006 EIP
- * 
+ *
  *---------------------------------------------------------------------------*/
 int_f
 nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
@@ -788,7 +788,7 @@ nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hi
  *                complains about wrong parameter types in h5dwrite_c function
  *                called by Fortran rouitnes
  *                                           October 10, 2006 EIP
- * 
+ *
  *---------------------------------------------------------------------------*/
 int_f
 nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f UNUSED *dims)
@@ -1965,8 +1965,8 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
  *		type_id	   - Identifier of the datatype to use when creating the dataset.
  *		space_id   - Identifier of the dataspace to use when creating the dataset.
  *              dcpl_id    - Dataset creation property list identifier.
- *              dapl_id    - Dataset access property list identifier.    
- * Outputs:     
+ *              dapl_id    - Dataset access property list identifier.
+ * Outputs:
  *              dset_id - dataset identifier
  *
  * Returns:     0 on success, -1 on failure
@@ -1974,18 +1974,18 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
  *              February, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, 
+nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
 		   hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 {
   int ret_value = -1;
-  
+
   /*
    * Call H5Dcreate2 function.
    */
-  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id, 
+  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id,
 					 (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
     goto DONE;
-  
+
   ret_value = 0;
 
  DONE:
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 1f3e416..f40b595 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -87,7 +87,7 @@ DONE:
  * Inputs:      loc_id - file or group identifier
  *              name - name of the group
  *              namelen - name length
- *              gapl_id - Group access property list identifier 
+ *              gapl_id - Group access property list identifier
  * Outputs:     grp_id - group identifier
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
@@ -664,8 +664,8 @@ DONE:
 /*----------------------------------------------------------------------------
  * Name:        h5gcreate_anon_c
  * Purpose:     Call H5Gcreate_anon
- * Inputs:      
- *              loc_id  - Location identifier 
+ * Inputs:
+ *              loc_id  - Location identifier
  *              gcpl_id - Group creation property list identifier
  *              gapl_id - Group access property list identifier
  *
@@ -680,7 +680,7 @@ nh5gcreate_anon_c(hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *
 {
 
   int_f ret_value=0;          /* Return value */
-  
+
   if ((*grp_id = (hid_t_f)H5Gcreate_anon((hid_t)*loc_id,(hid_t)*gcpl_id,(hid_t)*gapl_id)) < 0)
     HGOTO_DONE(FAIL);
 
@@ -689,9 +689,9 @@ done:
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5gget_create_plist_c 
+ * Name:        h5gget_create_plist_c
  * Purpose:     Call H5Gget_create_plist
- * Inputs:      
+ * Inputs:
  *              grp_id - group identifier
  *
  * Outputs:     gcpl_id - Group creation property list identifier
@@ -717,7 +717,7 @@ done:
  * Name:      h5gget_info_c
  * Purpose:   Call H5Gget_info
  * Inputs:    group_id - Group identifier
- * Outputs: 
+ * Outputs:
  *            storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
@@ -730,7 +730,7 @@ done:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 15, 2008
- * Modifications:     
+ * Modifications:
  *          - Added 'mounted' paramater
  *            M.S. Breitenfeld
  *            July 16, 2008
@@ -764,7 +764,7 @@ done:
 /*----------------------------------------------------------------------------
  * Name:      h5gget_info_by_idx_c
  * Purpose:   Call H5Gget_info_by_idx
- * Inputs:    
+ * Inputs:
  *          loc_id - File or group identifier
  *      group_name - Name of group containing group for which information is to be retrieved
  *   group_namelen - name length
@@ -772,7 +772,7 @@ done:
  *           order - Order of the count in the index
  *               n - Position in the index of the group for which information is retrieved
  *         lapl_id - Link access property list
- * Outputs: 
+ * Outputs:
  *            storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
@@ -785,14 +785,14 @@ done:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 18, 2008
- * Modifications:      
+ * Modifications:
  *          - Added 'mounted' paramater
  *            M.S. Breitenfeld
  *            July 16, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-		      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, 
+nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+		      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
 		      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
 
 {
@@ -829,12 +829,12 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 /*----------------------------------------------------------------------------
  * Name:      h5gget_info_by_name_c
  * Purpose:   Call H5Gget_info_by_name
- * Inputs:    
+ * Inputs:
  *          loc_id - File or group identifier
  *      group_name - Name of group containing group for which information is to be retrieved
  *   group_namelen - name length
  *         lapl_id - Link access property list
- * Outputs: 
+ * Outputs:
  *            storage_type - Type of storage for links in group:
  *                             H5G_STORAGE_TYPE_COMPACT: Compact storage
  *                             H5G_STORAGE_TYPE_DENSE: Indexed storage
@@ -847,13 +847,13 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 18, 2008
- * Modifications:      
+ * Modifications:
  *          - Added 'mounted' paramater
  *            M.S. Breitenfeld
  *            July 16, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, 
+nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
 		       int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
 
 {
diff --git a/fortran/src/H5If.c b/fortran/src/H5If.c
index e5d4d29..5368861 100644
--- a/fortran/src/H5If.c
+++ b/fortran/src/H5If.c
@@ -54,9 +54,9 @@ nh5iget_type_c (hid_t_f *obj_id, int_f *type)
  * Returns:     length of the name on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, March 12, 2003
- * Modifications: 
+ * Modifications:
  *               Changed the size of c_buf_size to c_buf_size + 1, which
- *               fixes the problem of truncating the string by 1 if the 
+ *               fixes the problem of truncating the string by 1 if the
  *               exact size of the string (buf_size) is passed in.
  *               M.S. Breitenfeld, April 21, 2008
  *---------------------------------------------------------------------------*/
@@ -70,7 +70,7 @@ nh5iget_name_c(hid_t_f *obj_id, _fcd buf, size_t_f *buf_size, size_t_f *name_siz
      char *c_buf =NULL;
 
      /*
-      * Allocate buffer to hold name of an object 
+      * Allocate buffer to hold name of an object
       */
      c_buf_size = (size_t)*buf_size +1;
      c_buf = (char *)HDmalloc(c_buf_size);
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
index ed6d2e1..4378f33 100644
--- a/fortran/src/H5Lf.c
+++ b/fortran/src/H5Lf.c
@@ -24,10 +24,10 @@
  * Inputs:
  *     src_loc_id - Location identifier of the source link
  *       src_name - Name of the link to be copied
- *    src_namelen - length of the name 
+ *    src_namelen - length of the name
  *    dest_loc_id - Location identifier specifying the destination of the copy
  *      dest_name - Name to be assigned to the NEW copy
- *   dest_namelen - Length of the name 
+ *   dest_namelen - Length of the name
  *         loc_id - Identifier of the file or group containing the object
  *           name - Name of the link to delete
  *        lcpl_id - Link creation property list identifier
@@ -40,7 +40,7 @@
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, 
+nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
 	     _fcd dest_name, size_t_f *dest_namelen,
 	     hid_t_f *lcpl_id, hid_t_f *lapl_id)
 {
@@ -59,7 +59,7 @@ nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *d
   /*
    * Call H5Lcopy function.
    */
-  if( H5Lcopy( (hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id, 
+  if( H5Lcopy( (hid_t)*src_loc_id, c_src_name, (hid_t) *dest_loc_id,
 	       c_dest_name, (hid_t)*lcpl_id, (hid_t)*lapl_id ) < 0)
     HGOTO_DONE(FAIL);
 
@@ -68,15 +68,15 @@ done:
     HDfree(c_src_name);
   if(c_dest_name)
     HDfree(c_dest_name);
-  
+
   return ret_value;
 }
 
 /*----------------------------------------------------------------------------
  * Name:        h5lcreate_external_c
- * Purpose:     Call H5Lcreate_external_c 
+ * Purpose:     Call H5Lcreate_external_c
  * Inputs:
- *    file_name - Name of the file containing the target object. Neither the file nor the target object is 
+ *    file_name - Name of the file containing the target object. Neither the file nor the target object is
  *                required to exist. May be the file the link is being created in.
  *     obj_name - Path within the target file to the target object.
  *  link_loc_id - The file or group identifier for the new link.
@@ -92,7 +92,7 @@ done:
 
 int_f
 nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
-		      hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, 
+		      hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
 		      hid_t_f *lcpl_id, hid_t_f *lapl_id)
 
 {
@@ -125,7 +125,7 @@ done:
     HDfree(c_obj_name);
   if(c_link_name)
     HDfree(c_link_name);
-  
+
   return ret_value;
 }
 
@@ -188,9 +188,9 @@ done:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, 
-		  hid_t_f *link_loc_id, 
-		  _fcd link_name, size_t_f *link_name_len, 
+nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
+		  hid_t_f *link_loc_id,
+		  _fcd link_name, size_t_f *link_name_len,
 		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
 {
   char *c_target_path = NULL;
@@ -240,9 +240,9 @@ nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-		  hid_t_f *link_loc_id, 
-		  _fcd link_name, size_t_f *link_namelen, 
+nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		  hid_t_f *link_loc_id,
+		  _fcd link_name, size_t_f *link_namelen,
 		  hid_t_f *lcpl_id, hid_t_f *lapl_id )
 {
   char *c_obj_name = NULL;
@@ -273,8 +273,8 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5ldelete_by_idx_c 
- * Purpose:     Calls h5ldelete_by_idx 
+ * Name:        h5ldelete_by_idx_c
+ * Purpose:     Calls h5ldelete_by_idx
  * Inputs:
  *          loc_id - File or group identifier specifying location of subject group
  *      group_name - Name of subject group
@@ -283,16 +283,16 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
  *                    H5_INDEX_UNKNOWN_F = -1  - Unknown index type
  *                    H5_INDEX_NAME_F          - Index on names
  *                    H5_INDEX_CRT_ORDER_F     - Index on creation order
- *                    H5_INDEX_N_F	       - Number of indices defined                   
+ *                    H5_INDEX_N_F	       - Number of indices defined
  *           order - Order within field or index; Possible values are:
  *                    H5_ITER_UNKNOWN_F   - Unknown order
  *                    H5_ITER_INC_F       - Increasing order
  *                    H5_ITER_DEC_F       - Decreasing order
  *                    H5_ITER_NATIVE_F    - No particular order, whatever is fastest
  *                    H5_ITER_N_F	  - Number of iteration orders
- *               n - Link for which to retrieve information  
- *         lapl_id - Link access property list     
- *              
+ *               n - Link for which to retrieve information
+ *         lapl_id - Link access property list
+ *
  * Outputs:     N/A
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -300,7 +300,7 @@ nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 		     int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
 {
     char *c_group_name = NULL;          /* Buffer to hold C string */
@@ -318,7 +318,7 @@ nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
     c_order = (H5_iter_order_t)*order;
 
      /*
-      * Call H5Ldelete_by_name function. 
+      * Call H5Ldelete_by_name function.
       */
     if(H5Ldelete_by_idx((hid_t)*loc_id, c_group_name, c_index_field, c_order, (hsize_t)*n, (hid_t)*lapl_id) < 0)
       HGOTO_DONE(FAIL);
@@ -331,7 +331,7 @@ done:
 
 /*----------------------------------------------------------------------------
  * Name:        h5lexists_c
- * Purpose:     Calls H5Lexists 
+ * Purpose:     Calls H5Lexists
  * Inputs:
  *      loc_id - Identifier of the file or group to query.
  *        name - Link name to check
@@ -370,14 +370,14 @@ done:
 /*----------------------------------------------------------------------------
  * Name:        h5lget_info_c
  * Purpose:     Call  H5Lget_info
- * Inputs:  
+ * Inputs:
  *		link_loc_id - File or group identifier.
  *                link_name - Name of the link for which information is being sought
  *             link_namelen - Name length
  *                  lapl_id - Link access property list
  * Outputs:
  *
- *              cset - indicates the character set used for link’s name. 
+ *              cset - indicates the character set used for link’s name.
  *            corder - specifies the link’s creation order position.
  *      corder_valid - indicates whether the value in corder is valid.
  *         link_type -  specifies the link class:
@@ -395,7 +395,7 @@ done:
  *---------------------------------------------------------------------------*/
 int_f
 nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-		int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
+		int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type,
 		int_f *address, hsize_t_f *val_size,
 		hid_t_f *lapl_id)
 {
@@ -431,7 +431,7 @@ done:
 /*----------------------------------------------------------------------------
  * Name:        h5lget_info_by_idx_c
  * Purpose:     Call  H5Lget_info_by_idx
- * Inputs: 
+ * Inputs:
  *	loc_id  - File or group identifier specifying location of subject group
  *   group_name - Name of subject group
  *group_namelen - Name length
@@ -439,8 +439,8 @@ done:
  *        order - Order within field or index
  *            n - Link for which to retrieve information
  *      lapl_id - Link access property list
- * Outputs:   
- *        corder_valid - Indicates whether the the creation order data is valid for this attribute 
+ * Outputs:
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
  *              corder - Is a positive integer containing the creation order of the attribute
  *                cset - Indicates the character set used for the attribute’s name
  *           data_size - indicates the size, in the number of characters, of the attribute
@@ -451,7 +451,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 		      int_f *index_field, int_f *order, hsize_t_f *n,
 		      int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id)
 {
@@ -508,16 +508,16 @@ nh5lis_registered_c(int_f *link_cls_id)
   int_f ret_value = 0;      /* Return value */
   H5L_type_t c_link_cls_id; /* User-defined link class identifier */
   htri_t registered; /* registration status */
-			
-		     
+
+
   c_link_cls_id = (H5L_type_t)*link_cls_id;
   /*
    * Call H5Lis_registered
    */
   registered = H5Lis_registered(c_link_cls_id);
-  
+
   ret_value = (int_f)registered;
-  
+
   return ret_value;
 }
 
@@ -608,7 +608,7 @@ nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
     if ((c_name = HDmalloc(c_size)) == NULL)
       HGOTO_DONE(FAIL);
 
-    if((*size = (size_t)H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field, 
+    if((*size = (size_t)H5Lget_name_by_idx((hid_t)*loc_id, c_group_name, (H5_index_t)*index_field,
 						     (H5_iter_order_t)*order, (hsize_t)*n,c_name, c_size, (hid_t)*lapl_id)) < 0)
       HGOTO_DONE(FAIL);
 
@@ -626,7 +626,7 @@ done:
 /*----------------------------------------------------------------------------
  * Name:        h5lget_val_c
  * Purpose:     Call  H5Lget_val
- * Inputs:  
+ * Inputs:
  *		link_loc_id - File or group identifier.
  *                link_name - Name of the link for which valrmation is being sought
  *             link_namelen - Name length
@@ -674,23 +674,23 @@ done:
  * Name:        H5Lregistered_c
  * Purpose:     Call H5Lregistered
  * Inputs:
- *		
+ *
  * Inputs:
- *     version         - Version number of this struct 
- *     class_id        - Link class identifier          
- *     comment         - Comment for debugging            
- *     comment_len     - Comment for debugging          
- *     create_func     - Callback during link creation            
+ *     version         - Version number of this struct
+ *     class_id        - Link class identifier
+ *     comment         - Comment for debugging
+ *     comment_len     - Comment for debugging
+ *     create_func     - Callback during link creation
  *     create_func_len - length
- *    move_func        - Callback after moving link       
- *    move_func_len    - length    
- *     copy_func       - Callback after copying link      
+ *    move_func        - Callback after moving link
+ *    move_func_len    - length
+ *     copy_func       - Callback after copying link
  *     copy_func_len   - length
- *     trav_func       - The main traversal function      
+ *     trav_func       - The main traversal function
  *     trav_func_len   - length
- *     del_func        - Callback for link deletion       
+ *     del_func        - Callback for link deletion
  *     del_func_len    - length
- *     query_func      - Callback for queries    
+ *     query_func      - Callback for queries
  *     query_func_len  - length
  *
  * Returns:     0 on success, -1 on failure
@@ -717,7 +717,7 @@ done:
 /*   char *c_trav_func = NULL;  */
 /*   char *c_del_func = NULL;  */
 /*   char *c_query_func = NULL; */
-  
+
 /*   H5L_class_t class_t; */
 
 /*   int ret_value = 0; */
@@ -769,20 +769,20 @@ done:
 /*     HDfree(c_src_name); */
 /*   if(c_dest_name) */
 /*     HDfree(c_dest_name); */
-  
+
 /*   return ret_value; */
 /* } */
 
 /*----------------------------------------------------------------------------
  * Name:        h5lget_val_c
  * Purpose:     Call H5Lget_val_c
- * Inputs: 
+ * Inputs:
  *               link_loc_id - File or group identifier.
  *                 link_name - Link whose value is to be returned.
  *             link_name_len - length of link_name
  *                      size - Maximum number of characters of link value to be returned.
  *                  lapl_id  - List access property list identifier
- * Outputs:   
+ * Outputs:
  *             linkval_buff  - The buffer to hold the returned link value.
  *
  * Returns:      0 on success, -1 on failure
@@ -791,7 +791,7 @@ done:
  * Modifications: N/A
  *---------------------------------------------------------------------------*/
 int_f
-nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, 
+nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
 	      void *linkval_buff, hid_t_f *lapl_id)
 {
   int_f ret_value = 0;       /* Return value */
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index 9a708da..5282dd6 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -21,7 +21,7 @@
 /*----------------------------------------------------------------------------
  * Name:        h5olink_c
  * Purpose:     Calls H5Olink
- * Inputs:   
+ * Inputs:
  *      object_id        - Object to be linked.
  *      new_loc_id       - File or group identifier specifying location at which object is to be linked.
  *      name             - Name of link to be created, relative to new_loc_id.
@@ -50,7 +50,7 @@ nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, size_t_f *namele
   /*
    * Call H5Olink function.
    */
-  if((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name, 
+  if((hid_t_f)H5Olink((hid_t)*object_id, (hid_t)*new_loc_id, c_name,
 		       (hid_t)*lcpl_id, (hid_t)*lapl_id) < 0)
     HGOTO_DONE(FAIL);
 
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index e466152..befb1cd 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -3448,7 +3448,7 @@ nh5pget_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_den
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_attr_creation_order_c 
+ * Name:        h5pset_attr_creation_order_c
  * Purpose:     Calls H5Ppset_attr_creation_order
  *
  * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier
@@ -3482,10 +3482,10 @@ nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags )
  *
  * Inputs:
  *       plist_id - file creation property list
- *       nindexes - Number of shared object header message indexes 
- *                   available in files created WITH this property list 
- * 
- * Outputs:     
+ *       nindexes - Number of shared object header message indexes
+ *                   available in files created WITH this property list
+ *
+ * Outputs:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              January, 2008
@@ -3519,8 +3519,8 @@ nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes )
  *          index_num - Index being configured.
  *    mesg_type_flags - Types of messages that should be stored in this index.
  *      min_mesg_size - Minimum message size.
- * 
- * Outputs:     
+ *
+ * Outputs:
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              January, 2008
@@ -3733,10 +3733,10 @@ nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag)
  * Name:        h5pset_create_inter_group_c
  * Purpose:     Calls H5Pset_create_intermediate_group
  *
- * Inputs:   
+ * Inputs:
  *		lcpl_id - Link creation property list identifier
- *   crt_intermed_group - crt_intermed_group specifying whether 
- *                        to create intermediate groups upon the 
+ *   crt_intermed_group - crt_intermed_group specifying whether
+ *                        to create intermediate groups upon the
  *                        creation of an object
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -3854,9 +3854,9 @@ nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding)
    */
   ret = H5Pget_char_encoding((hid_t)*plist_id, &c_encoding);
   if (ret < 0) return ret_value;
-  
+
   *encoding = (int_f)c_encoding;
-  
+
   ret_value = 0;
   return ret_value;
 }
@@ -3887,7 +3887,7 @@ nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
    */
   ret = H5Pset_copy_object((hid_t)*ocp_plist_id, (unsigned)*copy_options);
   if (ret < 0) return ret_value;
-  
+
   ret_value = 0;
   return ret_value;
 }
@@ -3920,7 +3920,7 @@ nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
   if (ret < 0) return ret_value;
 
   *copy_options = (int_f)c_copy_options;
-  
+
   ret_value = 0;
   return ret_value;
 }
@@ -3928,14 +3928,14 @@ nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
 /*----------------------------------------------------------------------------
  * Name:        h5pget_data_transform_c
  * Purpose:     Calls H5Pget_data_transform
- * Inputs:      
+ * Inputs:
  *              prp_id - property list identifier to query
  *      expression_len - buffer size transorm expression
  *
- * Output:      
+ * Output:
  *          expression - buffer to hold transform expression
  *
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -3968,7 +3968,7 @@ nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
      if(ret < 0) return ret_value;
      /* or strlen ? */
      HD5packFstring(c_expression, _fcdtocp(expression), c_expression_len-1);
-     
+
      *size = (size_t_f)ret;
 
      ret_value = 0;
@@ -3978,14 +3978,14 @@ nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
 /*----------------------------------------------------------------------------
  * Name:        h5pset_data_transform_c
  * Purpose:     Calls H5Pset_data_transform
- * Inputs:      
- *              prp_id - property list identifier to query      
+ * Inputs:
+ *              prp_id - property list identifier to query
  *          expression - buffer to hold transform expression
  *      expression_len - buffer size transorm expression
  *
  * Output:
  *
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4020,12 +4020,12 @@ nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_l
 /*----------------------------------------------------------------------------
  * Name:        h5pget_local_heap_size_hint_c
  * Purpose:     Calls H5Pget_local_heap_size_hint
- * Inputs: 
+ * Inputs:
  *         gcpl_id - Group creation property list identifier
  *
  * Output:
  *       size_hint - Hint for size of local heap
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4053,13 +4053,13 @@ nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
 /*----------------------------------------------------------------------------
  * Name:        h5pget_est_link_info_c
  * Purpose:     Calls H5Pget_est_link_info
- * Inputs: 
+ * Inputs:
  *              gcpl_id - Group creation property list identifier
  *
- * Output: 
+ * Output:
  *      est_num_entries - Estimated number of links to be inserted into group
  *         est_name_len - Estimated average length of link names
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4090,13 +4090,13 @@ nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_nam
 /*----------------------------------------------------------------------------
  * Name:        h5pset_local_heap_size_hint_c
  * Purpose:     Calls H5Pset_local_heap_size_hint
- * Inputs: 
+ * Inputs:
  *         gcpl_id - Group creation property list identifier
  *       size_hint - Hint for size of local heap
  *
  * Output:
  *
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4122,13 +4122,13 @@ nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint)
 /*----------------------------------------------------------------------------
  * Name:        h5pset_est_link_info_c
  * Purpose:     Calls H5Pset_est_link_info
- * Inputs: 
- *              gcpl_id - Group creation property list identifier 
+ * Inputs:
+ *              gcpl_id - Group creation property list identifier
  *      est_num_entries - Estimated number of links to be inserted into group
  *         est_name_len - Estimated average length of link names
  *
  * Output:
- * Returns:     
+ * Returns:
  *          Success:  0
  *	    Failure: -1
  *
@@ -4155,7 +4155,7 @@ nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_nam
  * Name:        h5pset_link_phase_change_c
  * Purpose:     Calls H5Pset_link_phase_change
  *
- * Inputs:      gcpl_id     - Group creation property list identifier   
+ * Inputs:      gcpl_id     - Group creation property list identifier
  *              max_compact - Maximum number of attributes to be stored in compact storage
  *              min_dense   - Minimum number of attributes to be stored in dense storage
  * Outputs
@@ -4184,7 +4184,7 @@ nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_den
  * Name:        h5pset_fapl_direct_c
  * Purpose:     Calls H5Pset_fapl_direct
  *
- * Inputs:   
+ * Inputs:
  *    fapl_id 	 - File access property list identifier
  *    alignment  - Required memory alignment boundary
  *    block_size - File system block size
@@ -4218,7 +4218,7 @@ nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_siz
  * Name:        h5pget_fapl_direct_c
  * Purpose:     Calls H5Pget_fapl_direct
  *
- * Inputs:   
+ * Inputs:
  *    fapl_id 	 - File access property list identifier
  * Outputs:
  *    alignment  - Required memory alignment boundary
@@ -4244,7 +4244,7 @@ nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_siz
    */
   ret = H5Pget_fapl_direct((hid_t)*fapl_id, &c_alignment, &c_block_size, &c_cbuf_size );
   if (ret < 0) return ret_value;
-  
+
   *alignment  = (size_t_f)c_alignment;
   *block_size = (size_t_f)c_block_size;
   *cbuf_size  = (size_t_f)c_cbuf_size;
@@ -4258,7 +4258,7 @@ nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_siz
  * Name:        h5pset_attr_phase_change_c
  * Purpose:     Calls H5Pset_attr_phase_change
  *
- * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier  
+ * Inputs:      ocpl_id		- Object (dataset or group) creation property list identifier
  *              max_compact     - Maximum number of attributes to be stored in compact storage
  *              min_dense       - Minimum number of attributes to be stored in dense storage
  * Outputs:
@@ -4283,7 +4283,7 @@ nh5pset_attr_phase_change_c(hid_t_f *ocpl_id, int_f *max_compact, int_f *min_den
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5pset_nbit_c 
+ * Name:        h5pset_nbit_c
  * Purpose:     Calls H5Pset_nbit
  *
  * Inputs:      plist_id - Dataset creation property list identifier
@@ -4308,10 +4308,10 @@ nh5pset_nbit_c(hid_t_f *plist_id )
   return ret_value;
 }
 /*----------------------------------------------------------------------------
- * Name:        h5pset_scaleoffset_c 
+ * Name:        h5pset_scaleoffset_c
  * Purpose:     Calls H5Pset_scaleoffset
  *
- * Inputs:    
+ * Inputs:
  *      plist_id - Dataset creation property list identifier
  *    scale_type - Flag indicating compression method.
  *  scale_factor - Parameter related to scale.
@@ -4341,9 +4341,9 @@ nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor
 
 /*----------------------------------------------------------------------------
  * Name:        h5pset_nlinks
- * Purpose:     Calls H5Pset_nlinks 
+ * Purpose:     Calls H5Pset_nlinks
  *
- * Inputs:   
+ * Inputs:
  *            lapl_id - File access property list identifier
  *             nlinks - Maximum number of links to traverse
  * Outputs:
@@ -4369,9 +4369,9 @@ nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
 
 /*----------------------------------------------------------------------------
  * Name:        h5pget_nlinks
- * Purpose:     Calls H5Pget_nlinks 
+ * Purpose:     Calls H5Pget_nlinks
  *
- * Inputs:   
+ * Inputs:
  *            lapl_id - File access property list identifier
  *
  * Outputs:
@@ -4403,9 +4403,9 @@ nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks)
  * Name:        h5pget_create_inter_group_c
  * Purpose:     Calls H5Pget_create_intermediate_group
  *
- * Inputs:   
+ * Inputs:
  *		lcpl_id - Link creation property list identifier
- *   crt_intermed_group - Specifying whether to create intermediate groups upon 
+ *   crt_intermed_group - Specifying whether to create intermediate groups upon
  *                        the creation of an object
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index 299f6bd..ba5d273 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -242,7 +242,7 @@ nh5rget_object_type_obj_c (hid_t_f *dset_id, haddr_t_f *ref, int_f *obj_type)
 /*----------------------------------------------------------------------------
  * Name:        h5rget_name_object_c
  * Purpose:     Call H5Rget_name for an object
- * Inputs: 
+ * Inputs:
  *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
  *          ref - An object or dataset region reference.
  *
@@ -285,14 +285,14 @@ nh5rget_name_object_c (hid_t_f *loc_id, haddr_t_f *ref, _fcd name, size_t_f *nam
      *size_default = (size_t_f)c_size;
      ret_value = 0;
      if(c_buf) HDfree(c_buf);
-     
+
      return ret_value;
 }
 
 /*----------------------------------------------------------------------------
  * Name:        h5rget_name_region_c
  * Purpose:     Call H5Rget_name for a dataset region
- * Inputs: 
+ * Inputs:
  *       loc_id - Identifier for the dataset containing the reference or for the group that dataset is in.
  *          ref - An object or dataset region reference.
  *
@@ -330,11 +330,11 @@ nh5rget_name_region_c (hid_t_f *loc_id, int_f *ref, _fcd name, size_t_f *name_le
      /*
       * Convert C name to FORTRAN and place it in the given buffer
       */
-     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1); 
+     HD5packFstring(c_buf, _fcdtocp(name), c_bufsize-1);
 
      *size_default = (size_t_f)c_size;
      ret_value = 0;
      if(c_buf) HDfree(c_buf);
-     
+
      return ret_value;
 }
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 4c8f799..5cf5b51 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -1030,7 +1030,7 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements,  hsi
 /*----------------------------------------------------------------------------
  * Name:        h5sdecode_c
  * Purpose:     Call H5Sdecode
- * Inputs:       
+ * Inputs:
  *		buf     - Buffer for the data space object to be decoded.
  * Outputs:
  *              obj_id  - Object_id (non-negative)
@@ -1052,7 +1052,7 @@ nh5sdecode_c ( _fcd buf, hid_t_f *obj_id )
    * Call H5Sdecode function.
    */
 
-  c_buf = (unsigned char*)buf; 
+  c_buf = (unsigned char*)buf;
 
   c_obj_id = H5Sdecode(c_buf);
   if(c_obj_id < 0)
@@ -1067,7 +1067,7 @@ nh5sdecode_c ( _fcd buf, hid_t_f *obj_id )
 /*----------------------------------------------------------------------------
  * Name:        h5sencode_c
  * Purpose:     Call H5Sencode
- * Inputs:       
+ * Inputs:
  *            obj_id - Identifier of the object to be encoded.
  *		 buf - Buffer for the object to be encoded into.
  *            nalloc - The size of the allocated buffer.
@@ -1112,9 +1112,9 @@ nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
     return ret_value;
   }
 
-  /* copy the C buffer to the FORTRAN buffer. 
+  /* copy the C buffer to the FORTRAN buffer.
    * Can not use HD5packFstring because we don't want to
-   * eliminate the NUL terminator or pad remaining space 
+   * eliminate the NUL terminator or pad remaining space
    * with blanks.
    */
 
@@ -1128,7 +1128,7 @@ nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
 /*----------------------------------------------------------------------------
  * Name:        h5sextent_equal_c
  * Purpose:     Call H5Sextent_equal
- * Inputs:        
+ * Inputs:
  *		space1_id - First dataspace identifier.
  *              space2_id - Second dataspace identifier.
  * Outputs:
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 490d739..f1be9c6 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -79,7 +79,7 @@ done:
  *                M.S. Breitenfeld
  *---------------------------------------------------------------------------*/
 int_f
-nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, 
+nh5tcommit_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id,
 	     hid_t_f *lcpl_id, hid_t_f *tcpl_id, hid_t_f *tapl_id)
 {
     char *c_name = NULL;
@@ -1655,17 +1655,17 @@ nh5tget_member_class_c ( hid_t_f *type_id ,  int_f *member_no, int_f *class )
  * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, 
+nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
 		  hid_t_f *tcpl_id, hid_t_f *tapl_id)
 {
   int ret_value = -1;
-  
+
   /* Call H5Tcommit_anon function */
   if(H5Tcommit_anon((hid_t)*loc_id, (hid_t)*dtype_id, (hid_t)*tcpl_id, (hid_t)*tapl_id) < 0)
     goto done;
-  
+
   ret_value = 0;
-  
+
  done:
   return ret_value;
 }
@@ -1674,8 +1674,8 @@ nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id,
  * Name:        h5tcommitted_c
  * Purpose:     Call H5Tcommitted
  *              dtype_id - dataset identifier
- * Returns:     a positive value, for TRUE, if the datatype has been committed, 
- *              or 0 (zero), for FALSE, if the datatype has not been committed. 
+ * Returns:     a positive value, for TRUE, if the datatype has been committed,
+ *              or 0 (zero), for FALSE, if the datatype has not been committed.
  *		Otherwise returns a negative value.
  * Programmer:  M.S. Breitenfeld
  *              February 25, 2008
@@ -1685,9 +1685,9 @@ int_f
 nh5tcommitted_c(hid_t_f *dtype_id)
 {
   int_f ret_value;
-  
+
   /* Call H5Tcommitted function */
-  
+
   ret_value=(int_f)H5Tcommitted((hid_t)*dtype_id);
 
   return ret_value;
@@ -1697,7 +1697,7 @@ nh5tcommitted_c(hid_t_f *dtype_id)
 /*----------------------------------------------------------------------------
  * Name:        h5tdecode_c
  * Purpose:     Call H5Tdecode
- * Inputs:       
+ * Inputs:
  *		buf     - Buffer for the data space object to be decoded.
  * Outputs:
  *              obj_id  - Object_id (non-negative)
@@ -1719,7 +1719,7 @@ nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
    * Call H5Tdecode function.
    */
 
-  c_buf = (unsigned char*)buf; 
+  c_buf = (unsigned char*)buf;
 
   c_obj_id = H5Tdecode(c_buf);
   if(c_obj_id < 0)
@@ -1734,7 +1734,7 @@ nh5tdecode_c ( _fcd buf, hid_t_f *obj_id )
 /*----------------------------------------------------------------------------
  * Name:        h5tencode_c
  * Purpose:     Call H5Tencode
- * Inputs:       
+ * Inputs:
  *            obj_id - Identifier of the object to be encoded.
  *		 buf - Buffer for the object to be encoded into.
  *            nalloc - The size of the allocated buffer.
@@ -1779,9 +1779,9 @@ nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
     return ret_value;
   }
 
-  /* copy the C buffer to the FORTRAN buffer. 
+  /* copy the C buffer to the FORTRAN buffer.
    * Can not use HD5packFstring because we don't want to
-   * eliminate the NUL terminator or pad remaining space 
+   * eliminate the NUL terminator or pad remaining space
    * with blanks.
    */
 
@@ -1794,7 +1794,7 @@ nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc )
 
 /*----------------------------------------------------------------------------
  * Name:        h5tget_create_plist_c
- * Purpose:     Call H5Tget_create_plist 
+ * Purpose:     Call H5Tget_create_plist
  * Inputs:      dtype_id          - Datatype identifier
  * Outputs:     dtpl_id           - Datatype property list identifier
  * Returns:     0 on success, -1 on failure
@@ -1810,7 +1810,7 @@ nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
 
     if ((*dtpl_id = (hid_t_f)H5Tget_create_plist((hid_t)*dtype_id)) < 0)
         return ret_value;
-    
+
     ret_value = 0;
     return ret_value;
 }
@@ -1818,9 +1818,9 @@ nh5tget_create_plist_c ( hid_t_f *dtype_id,  hid_t_f *dtpl_id)
 /*----------------------------------------------------------------------------
  * Name:        h5tcompiler_conv_c
  * Purpose:     Call H5Tcompiler_conv
- * Inputs:    
+ * Inputs:
  *              src_id - Identifier for the source datatype.
- *              dst_id - Identifier for the destination datatype. 
+ *              dst_id - Identifier for the destination datatype.
  * Outputs:     c_flag - flag; TRUE for compiler conversion, FALSE for library conversion
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
@@ -1843,7 +1843,7 @@ nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag)
 /*----------------------------------------------------------------------------
  * Name:        h5tget_native_type_c
  * Purpose:     Call H5Tget_native_type
- * Inputs:    
+ * Inputs:
  *              dtype_id         - Datatype identifier for the dataset datatype.
  *              direction        - Direction of search.
  * Outputs:     native_dtype_id  - The native datatype identifier for the specified dataset datatype
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index efc478d..8a81010 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -218,7 +218,7 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *                                  EIP, April 9, 2005
  *                    Added Generic flags introduced in version 1.8
  *                                  MSB, January, 2008
- *                    Added types in lines h5*_flags = ( )variable to match input 
+ *                    Added types in lines h5*_flags = ( )variable to match input
  *---------------------------------------------------------------------------*/
 int_f
 nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
@@ -272,7 +272,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
     h5f_flags[15] = (int_f)H5F_OBJ_ALL;
     h5f_flags[16] = (int_f)H5F_LIBVER_EARLIEST;
     h5f_flags[17] = (int_f)H5F_LIBVER_LATEST;
-                           
+
 /*
  *  H5FD flags
  */
@@ -309,7 +309,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
     h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE;
 /* This value can no longer be returned and all these flags should be updated
  *      to reflect the refinements between links and objects. -QAK */
-/*      h5g_flags[4] = H5G_LINK; */    
+/*      h5g_flags[4] = H5G_LINK; */
     h5g_flags[5] = (int_f)H5L_TYPE_ERROR;
     h5g_flags[6] = (int_f)H5L_TYPE_HARD;
     h5g_flags[7] = (int_f)H5L_TYPE_SOFT;
@@ -339,7 +339,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
     h5l_flags[3] = (int_f)H5L_TYPE_EXTERNAL;
     h5l_flags[4] = (int_f)H5L_SAME_LOC; /* Macro to indicate operation occurs on same location */
     h5l_flags[5] = (int_f)H5L_LINK_CLASS_T_VERS; /* Current version of the H5L_class_t struct */
- 
+
 /*
  *  H5O flags
  */
@@ -374,7 +374,7 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
       h5o_flags[16] = (int_f)H5O_HDR_ATTR_CRT_ORDER_INDEXED; /* Attribute creation order has index */
       h5o_flags[17] = (int_f)H5O_HDR_ATTR_STORE_PHASE_CHANGE; /* Non-default attribute storage phase change values stored */
       h5o_flags[18] = (int_f)H5O_HDR_STORE_TIMES; /* Store access, modification, change & birth times for object */
-      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS; 
+      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS;
 
 /* Maximum shared message values.  Number of indexes is 8 to allow room to add
  * new types of messages.
@@ -519,8 +519,8 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
       h5_generic_flags[1] = (int_f)H5_INDEX_NAME;      /* Index on names 			*/
       h5_generic_flags[2] = (int_f)H5_INDEX_CRT_ORDER; /* Index on creation order 		*/
       h5_generic_flags[3] = (int_f)H5_INDEX_N;         /* Index on creation order 		*/
-      
-      
+
+
       /* H5_iter_order_t enum struct */
 
       h5_generic_flags[4] = (int_f)H5_ITER_UNKNOWN;       /* Unknown order */
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index af86372..f812b29 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -231,7 +231,7 @@ H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid
 #   define nh5dcreate_anon_c      H5_FC_FUNC_(h5dcreate_anon_c, H5DCREATE_ANON_C)
 
 
-H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id, 
+H5_FCDLL int_f nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
 			     hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id);
 H5_FCDLL int_f nh5dclose_c ( hid_t_f *dset_id );
@@ -338,8 +338,8 @@ H5_FCDLL int_f nh5dfill_integer_c(void * fill_value, hid_t_f *fill_type_id, hid_
 H5_FCDLL int_f nh5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dfill_double_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id);
 H5_FCDLL int_f nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag);
-H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id, 
-				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id); 
+H5_FCDLL int_f nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
+				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
 
 /*
  * Functions from H5Gf.c
@@ -378,14 +378,14 @@ H5_FCDLL int_f nh5gmove2_c (hid_t_f *src_loc_id, _fcd src_name, int_f *src_namel
 H5_FCDLL int_f nh5gget_linkval_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *size, _fcd value );
 H5_FCDLL int_f nh5gset_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, _fcd comment, int_f *commentlen);
 H5_FCDLL int_f nh5gget_comment_c (hid_t_f *loc_id, _fcd name, int_f *namelen, size_t_f *bufsize, _fcd comment);
-H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id); 
-H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id ); 
-H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted); 
-H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-				     int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, 
-				     int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted); 
-H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, 
-				      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted); 
+H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *gapl_id, hid_t_f *grp_id);
+H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id );
+H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
+H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+				     int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
+				     int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
+H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id,
+				      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted);
 
 /*
  * Functions from H5Af.c
@@ -467,23 +467,23 @@ H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f
 #   define nh5aget_type_c    H5_FC_FUNC_(h5aget_type_c, H5AGET_TYPE_C)
 #   define nh5aget_num_attrs_c H5_FC_FUNC_(h5aget_num_attrs_c, H5AGET_NUM_ATTRS_C)
 #   define nh5adelete_c      H5_FC_FUNC_(h5adelete_c, H5ADELETE_C)
-#   define nh5aget_storage_size_c H5_FC_FUNC_(h5aget_storage_size_c, H5AGET_STORAGE_SIZE_C) 
-#   define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C) 
-#   define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C) 
-#   define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C) 
-#   define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C) 
-#   define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C) 
-#   define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C) 
-#   define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C) 
-#   define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C) 
-#   define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C) 
-#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) 
-#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) 
-#   define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C) 
-#   define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C) 
-#   define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C) 
-#   define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C) 
-#   define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C) 
+#   define nh5aget_storage_size_c H5_FC_FUNC_(h5aget_storage_size_c, H5AGET_STORAGE_SIZE_C)
+#   define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C)
+#   define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C)
+#   define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C)
+#   define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C)
+#   define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C)
+#   define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C)
+#   define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C)
+#   define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C)
+#   define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C)
+#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C)
+#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C)
+#   define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C)
+#   define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C)
+#   define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C)
+#   define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C)
+#   define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C)
 
 H5_FCDLL int_f nh5acreate_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id, hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl,  hid_t_f *attr_id);
 H5_FCDLL int_f nh5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id);
@@ -562,45 +562,45 @@ H5_FCDLL int_f nh5aget_space_c (hid_t_f *attr_id, hid_t_f *space_id);
 H5_FCDLL int_f nh5aget_type_c (hid_t_f *attr_id, hid_t_f *type_id);
 H5_FCDLL int_f nh5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num);
 H5_FCDLL int_f nh5aget_name_c(hid_t_f *attr_id, size_t_f *size, _fcd buf);
-H5_FCDLL int_f nh5aget_storage_size_c ( hid_t_f *attr_id, hsize_t_f *size ); 
-H5_FCDLL int_f nh5arename_by_name_c ( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+H5_FCDLL int_f nh5aget_storage_size_c ( hid_t_f *attr_id, hsize_t_f *size );
+H5_FCDLL int_f nh5arename_by_name_c ( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				      _fcd old_attr_name, size_t_f *old_attr_namelen,
-				      _fcd new_attr_name, size_t_f *new_attr_namelen, 
-				      hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5aopen_c ( hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, 
-			    hid_t_f *aapl_id, hid_t_f *attr_id); 
-H5_FCDLL int_f nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				     _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				    int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				      int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name, 
-				      size_t_f *size, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id ); 
-H5_FCDLL int_f nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id); 
-H5_FCDLL int_f nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder, 
-			       int_f *cset, hsize_t_f *data_size ); 
-H5_FCDLL int_f nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, 
+				      _fcd new_attr_name, size_t_f *new_attr_namelen,
+				      hid_t_f *lapl_id );
+H5_FCDLL int_f nh5aopen_c ( hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen,
+			    hid_t_f *aapl_id, hid_t_f *attr_id);
+H5_FCDLL int_f nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				     _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				    int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				      int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
+				      size_t_f *size, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id );
+H5_FCDLL int_f nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
+H5_FCDLL int_f nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
+			       int_f *cset, hsize_t_f *data_size );
+H5_FCDLL int_f nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				      int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
-				      int_f *corder_valid, int_f *corder, 
-				      int_f *cset, hsize_t_f *data_size ); 
+				      int_f *corder_valid, int_f *corder,
+				      int_f *cset, hsize_t_f *data_size );
 H5_FCDLL int_f nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				       _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
-				       int_f *corder_valid, int_f *corder, 
-				       int_f *cset, hsize_t_f *data_size ); 
+				       int_f *corder_valid, int_f *corder,
+				       int_f *cset, hsize_t_f *data_size );
 H5_FCDLL int_f nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 				    _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
 				    hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
-				    hid_t_f *lapl_id, hid_t_f *attr_id ); 
-H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists); 
-H5_FCDLL int_f nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
-		      hid_t_f *lapl_id, int_f *attr_exists); 
-H5_FCDLL int_f nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, 
-				   hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id); 
+				    hid_t_f *lapl_id, hid_t_f *attr_id );
+H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists);
+H5_FCDLL int_f nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
+		      hid_t_f *lapl_id, int_f *attr_exists);
+H5_FCDLL int_f nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
+				   hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id);
 H5_FCDLL int_f nh5arename_c( hid_t_f *loc_id,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
-		      _fcd new_attr_name, size_t_f *new_attr_namelen); 
+		      _fcd new_attr_name, size_t_f *new_attr_namelen);
 
 /*
  * Functions form H5Tf.c file
@@ -869,37 +869,37 @@ H5_FCDLL int_f nh5olink_c (hid_t_f *object_id, hid_t_f *new_loc_id, _fcd name, s
 #   define nh5pset_fapl_multi_sc          H5_FC_FUNC_(h5pset_fapl_multi_sc, H5PSET_FAPL_MULTI_SC)
 #   define nh5pset_szip_c                 H5_FC_FUNC_(h5pset_szip_c, H5PSET_SZIP_C)
 #   define nh5pall_filters_avail_c        H5_FC_FUNC_(h5pall_filters_avail_c, H5PALL_FILTERS_AVAIL_C)
-#   define nh5pget_attr_phase_change_c    H5_FC_FUNC_(h5pget_attr_phase_change_c, H5PGET_ATTR_PHASE_CHANGE_C) 
-#   define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C) 
-#   define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C) 
-#   define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C) 
-#   define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C) 
-#   define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C) 
-#   define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C) 
-#   define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C) 
-#   define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C) 
-#   define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C) 
-#   define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C) 
-#   define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C) 
-#   define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C) 
-#   define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C) 
-#   define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C) 
-#   define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C) 
-#   define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C) 
-#   define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C) 
-#   define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C) 
-#   define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C) 
-#   define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C) 
-#   define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C) 
-#   define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C) 
-#   define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C) 
-#   define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C) 
-#   define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C) 
-#   define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C) 
-#   define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C) 
-#   define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C) 
-#   define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C) 
-#   define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C) 
+#   define nh5pget_attr_phase_change_c    H5_FC_FUNC_(h5pget_attr_phase_change_c, H5PGET_ATTR_PHASE_CHANGE_C)
+#   define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C)
+#   define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C)
+#   define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C)
+#   define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C)
+#   define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C)
+#   define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C)
+#   define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C)
+#   define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C)
+#   define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C)
+#   define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C)
+#   define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C)
+#   define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C)
+#   define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C)
+#   define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C)
+#   define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C)
+#   define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C)
+#   define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C)
+#   define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C)
+#   define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C)
+#   define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C)
+#   define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C)
+#   define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C)
+#   define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C)
+#   define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C)
+#   define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C)
+#   define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C)
+#   define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C)
+#   define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C)
+#   define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C)
+#   define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C)
 
 H5_FCDLL int_f nh5pcreate_c ( hid_t_f *class, hid_t_f *prp_id );
 H5_FCDLL int_f nh5pclose_c ( hid_t_f *prp_id );
@@ -1025,37 +1025,37 @@ H5_FCDLL int_f nh5pset_fapl_multi_sc ( hid_t_f *prp_id , int_f *flag);
 H5_FCDLL int_f nh5pset_szip_c ( hid_t_f *prp_id , int_f *options_mask, int_f *pixels_per_block);
 H5_FCDLL int_f nh5pall_filters_avail_c ( hid_t_f *prp_id , int_f *status);
 H5_FCDLL int_f nh5pfill_value_defined_c ( hid_t_f *prp_id , int_f *flag);
-H5_FCDLL int_f nh5pget_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags ); 
-H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes ); 
-H5_FCDLL int_f nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size); 
-H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags); 
-H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high); 
-H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); 
-H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag); 
-H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag); 
-H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); 
-H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); 
-H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); 
-H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding); 
-H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding); 
-H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); 
-H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); 
-H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size); 
-H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len); 
-H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); 
-H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); 
-H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); 
-H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); 
-H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size ); 
-H5_FCDLL int_f nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size ); 
-H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); 
-H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id ); 
-H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor ); 
-H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); 
-H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); 
+H5_FCDLL int_f nh5pget_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags );
+H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes );
+H5_FCDLL int_f nh5pset_shared_mesg_index_c(hid_t_f *fcpl_id, int_f *index_num, int_f *mesg_type_flags, int_f *min_mesg_size);
+H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high);
+H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
+H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag);
+H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
+H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group);
+H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags);
+H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
+H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding);
+H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
+H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options);
+H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size);
+H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len);
+H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
+H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
+H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint);
+H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len);
+H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pset_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size );
+H5_FCDLL int_f nh5pget_fapl_direct_c(hid_t_f *fapl_id, size_t_f *alignment, size_t_f *block_size, size_t_f *cbuf_size );
+H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense );
+H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id );
+H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor );
+H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
+H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks);
 /*
  * Functions frome H5Rf.c
  */
@@ -1158,52 +1158,52 @@ H5_FCDLL int_f nh5zget_filter_info_c (int_f *filter, int_f *flag);
 /*
  * Functions from H5Lf.c
  */
-# define nh5lcopy_c H5_FC_FUNC_(h5lcopy_c, H5LCOPY_C) 
-# define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C) 
-# define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C) 
-# define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C) 
-# define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C) 
-# define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C) 
-# define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C) 
-# define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C) 
-# define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C) 
-# define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C) 
-# define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C) 
-# define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C) 
+# define nh5lcopy_c H5_FC_FUNC_(h5lcopy_c, H5LCOPY_C)
+# define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C)
+# define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C)
+# define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C)
+# define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C)
+# define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C)
+# define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C)
+# define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C)
+# define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C)
+# define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C)
+# define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C)
+# define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C)
 # define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C)
 
-H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id, 
+H5_FCDLL int_f nh5lcopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
 			  _fcd dest_name, size_t_f *dest_namelen,
-			  hid_t_f *lcpl_id, hid_t_f *lapl_id); 
+			  hid_t_f *lcpl_id, hid_t_f *lapl_id);
 H5_FCDLL int_f nh5lcreate_external_c(_fcd file_name, size_t_f *file_namelen, _fcd obj_name, size_t_f *obj_namelen,
-				     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, 
-				     hid_t_f *lcpl_id, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen, 
-				 hid_t_f *link_loc_id, 
-				 _fcd link_name, size_t_f *link_namelen, 
-				 hid_t_f *lcpl_id, hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len, 
-				 hid_t_f *link_loc_id, 
-				 _fcd link_name, size_t_f *link_name_len, 
-				 hid_t_f *lcpl_id, hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id ); 
-H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-				    int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists); 
+				     hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
+				     hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lcreate_hard_c(hid_t_f *obj_loc_id, _fcd obj_name, size_t_f *obj_namelen,
+				 hid_t_f *link_loc_id,
+				 _fcd link_name, size_t_f *link_namelen,
+				 hid_t_f *lcpl_id, hid_t_f *lapl_id );
+H5_FCDLL int_f nh5lcreate_soft_c(_fcd target_path, size_t_f *target_path_len,
+				 hid_t_f *link_loc_id,
+				 _fcd link_name, size_t_f *link_name_len,
+				 hid_t_f *lcpl_id, hid_t_f *lapl_id );
+H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id );
+H5_FCDLL int_f nh5ldelete_by_idx_c (hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+				    int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lexists_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, int_f *link_exists);
 H5_FCDLL int_f nh5lget_info_c (hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen,
-			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type, 
+			       int_f *cset, int_f *corder, int_f *corder_valid, int_f *link_type,
 			       int_f *address, hsize_t_f *link_len,
-			       hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
-				     int_f *index_field, int_f *order, hsize_t_f *n, 
-				     int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id); 
+			       hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
+				     int_f *index_field, int_f *order, hsize_t_f *n,
+				     int_f *corder_valid, int_f *corder, int_f *cset, hsize_t_f *data_size, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id);
 H5_FCDLL int_f nh5lmove_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_namelen, hid_t_f *dest_loc_id,
-			  _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, 
+			  _fcd dest_name, size_t_f *dest_namelen, hid_t_f *lcpl_id, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lget_name_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
 				     int_f *index_field, int_f *order, hsize_t_f *n,
-				     size_t_f *size, _fcd name, hid_t_f *lapl_id); 
-H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size, 
+				     size_t_f *size, _fcd name, hid_t_f *lapl_id);
+H5_FCDLL int_f nh5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
 			     void *linkval_buff, hid_t_f *lapl_id) ;
 
 #endif /* _H5f90proto_H */