[svn-r15922] Description:

	Bring revisions 15289:15457 from trunk into metadata journaling
branch.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.2 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

4 files changed, 320 insertions, 258 deletions

diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 28e5312..1f3e416 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -725,14 +725,18 @@ done:
  *
  *                  nlinks - Number of links in group
  *              max_corder - Current maximum creation order value for group
+ *                 mounted - Whether group has a file mounted on it (0 = false, 1 = true)
  *
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 15, 2008
- * Modifications: N/A
+ * Modifications:     
+ *          - Added 'mounted' paramater
+ *            M.S. Breitenfeld
+ *            July 16, 2008
  *---------------------------------------------------------------------------*/
 int_f
-nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder)
+nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
 {
 
     int_f ret_value = 0;          /* Return value */
@@ -749,6 +753,8 @@ nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *ma
     *storage_type = (int_f)ginfo.storage_type;
     *nlinks = (int_f)ginfo.nlinks;
     *max_corder = (int_f)ginfo.max_corder;
+    *mounted = 0;
+    if(ginfo.mounted) *mounted = 1;
 
 done:
     return ret_value;
@@ -774,16 +780,20 @@ done:
  *
  *                  nlinks - Number of links in group
  *              max_corder - Current maximum creation order value for group
+ *                 mounted - Whether group has a file mounted on it (0 = false, 1 = true)
  *
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 18, 2008
- * Modifications: N/A
+ * 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, 
-		      int_f *storage_type, int_f *nlinks, int_f *max_corder)
+		      int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted )
 
 {
   char *c_group_name = NULL;          /* Buffer to hold group name C string */
@@ -807,6 +817,8 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
   *storage_type = (int_f)ginfo.storage_type;
   *nlinks = (int_f)ginfo.nlinks;
   *max_corder = (int_f)ginfo.max_corder;
+  *mounted = 0;
+  if(ginfo.mounted) *mounted = 1;
 
  done:
   if(c_group_name)
@@ -830,15 +842,19 @@ nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen,
  *
  *                  nlinks - Number of links in group
  *              max_corder - Current maximum creation order value for group
+ *                 mounted - Whether group has a file mounted on it (0 = false, 1 = true)
  *
  * Returns:     0 on success, -1 on failure
  * Programmer:  M.S. Breitenfeld
  *              February 18, 2008
- * Modifications: N/A
+ * 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, 
-		       int_f *storage_type, int_f *nlinks, int_f *max_corder)
+		       int_f *storage_type, int_f *nlinks, int_f *max_corder, int_f *mounted)
 
 {
   char *c_group_name = NULL;          /* Buffer to hold group name C string */
@@ -861,6 +877,8 @@ nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen
   *storage_type = (int_f)ginfo.storage_type;
   *nlinks = (int_f)ginfo.nlinks;
   *max_corder = (int_f)ginfo.max_corder;
+  *mounted = 0;
+  if(ginfo.mounted) *mounted = 1;
 
  done:
   if(c_group_name)
diff --git a/fortran/src/H5Gff.f90 b/fortran/src/H5Gff.f90
index 1e4b2b1..13baa94 100644
--- a/fortran/src/H5Gff.f90
+++ b/fortran/src/H5Gff.f90
@@ -1197,16 +1197,19 @@ CONTAINS
 !		          Success:  0
 !		          Failure: -1   
 ! Optional parameters:
-!				NONE			
+!	    mounted - Whether group has a file mounted on it			
 !
 ! Programmer:	M. S. Breitenfeld
 !		February 15, 2008	
 !
-! Modifications:  N/A
+! Modifications:     
+!          - Added 'mounted' paramater
+!            M.S. Breitenfeld
+!            July 16, 2008
 !
 !----------------------------------------------------------------------
 
-  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr) 
+  SUBROUTINE h5gget_info_f(group_id, storage_type, nlinks, max_corder, hdferr, mounted) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gget_info_f
@@ -1222,11 +1225,14 @@ CONTAINS
     INTEGER, INTENT(OUT) :: max_corder ! Current maximum creation order value for group
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
+    LOGICAL, INTENT(OUT), OPTIONAL :: mounted      ! Whether group has a file mounted on it
+
+    INTEGER :: mounted_c
 
 !  MS FORTRAN needs explicit interface for C functions called here.
 !
     INTERFACE
-       INTEGER FUNCTION h5gget_info_c(group_id, storage_type, nlinks, max_corder)
+       INTEGER FUNCTION h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_C'::h5gget_info_c
@@ -1235,10 +1241,19 @@ CONTAINS
          INTEGER, INTENT(OUT) :: storage_type
          INTEGER, INTENT(OUT) :: nlinks
          INTEGER, INTENT(OUT) :: max_corder
+         INTEGER :: mounted_c
        END FUNCTION h5gget_info_c
     END INTERFACE
 
-    hdferr = h5gget_info_c(group_id, storage_type, nlinks, max_corder)
+    hdferr = h5gget_info_c(group_id, storage_type, nlinks, max_corder, mounted_c)
+
+    IF(PRESENT(mounted))THEN
+       IF(mounted_c.EQ.0) THEN 
+          mounted = .FALSE.
+       ELSE 
+          mounted = .TRUE.
+       ENDIF
+    ENDIF
     
   END SUBROUTINE h5gget_info_f
 
@@ -1266,17 +1281,21 @@ CONTAINS
 !		          Success:  0
 !		          Failure: -1   
 ! Optional parameters:
-!         lapl_id - Link access property list		
+!         lapl_id - Link access property list
+!	  mounted - Whether group has a file mounted on it		
 !
 ! Programmer:	M. S. Breitenfeld
 !		February 18, 2008	
 !
-! Modifications:  N/A
+! Modifications:    
+!          - Added 'mounted' paramater
+!            M.S. Breitenfeld
+!            July 16, 2008
 !
 !----------------------------------------------------------------------
 
   SUBROUTINE h5gget_info_by_idx_f(loc_id, group_name, index_type, order, n, &
-       storage_type, nlinks, max_corder, hdferr, lapl_id) 
+       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gget_info_by_idx_f
@@ -1297,7 +1316,9 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
+    LOGICAL, INTENT(OUT), OPTIONAL :: mounted      ! Whether group has a file mounted on it
 
+    INTEGER :: mounted_c
     INTEGER(HID_T) :: lapl_id_default
     INTEGER(SIZE_T) :: group_name_len ! length of group name
 
@@ -1305,7 +1326,7 @@ CONTAINS
 !
     INTERFACE
        INTEGER FUNCTION h5gget_info_by_idx_c(loc_id, group_name, group_name_len, index_type, order, n, lapl_id_default, &
-            storage_type, nlinks, max_corder)
+            storage_type, nlinks, max_corder, mounted_c)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_BY_IDX_C'::h5gget_info_by_idx_c
@@ -1321,6 +1342,7 @@ CONTAINS
          INTEGER, INTENT(OUT) :: max_corder
 
          INTEGER(SIZE_T) :: group_name_len
+         INTEGER :: mounted_c
 
        END FUNCTION h5gget_info_by_idx_c
     END INTERFACE
@@ -1328,11 +1350,19 @@ CONTAINS
     group_name_len = LEN(group_name)
 
     lapl_id_default = H5P_DEFAULT_F
-    IF(present(lapl_id)) lapl_id_default = lapl_id
+    IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
 
     hdferr = h5gget_info_by_idx_c(loc_id, group_name, group_name_len, &
          index_type, order, n, lapl_id_default, &
-         storage_type, nlinks, max_corder)
+         storage_type, nlinks, max_corder, mounted_c)
+
+    IF(PRESENT(mounted))THEN
+       IF(mounted_c.EQ.0) THEN 
+          mounted = .FALSE.
+       ELSE 
+          mounted = .TRUE.
+       ENDIF
+    ENDIF
     
   END SUBROUTINE h5gget_info_by_idx_f
   
@@ -1357,17 +1387,20 @@ CONTAINS
 !		          Success:  0
 !		          Failure: -1   
 ! Optional parameters:
-!         lapl_id - Link access property list		
+!         lapl_id - Link access property list
+!	  mounted - Whether group has a file mounted on it		
 !
 ! Programmer:	M. S. Breitenfeld
 !		February 18, 2008	
 !
-! Modifications:  N/A
-!
+! Modifications:  
+!          - Added 'mounted' paramater
+!            M.S. Breitenfeld
+!            July 16, 2008
 !----------------------------------------------------------------------
 
   SUBROUTINE h5gget_info_by_name_f(loc_id, group_name, &
-       storage_type, nlinks, max_corder, hdferr, lapl_id) 
+       storage_type, nlinks, max_corder, hdferr, lapl_id, mounted) 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5gget_info_by_name_f
@@ -1385,7 +1418,9 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr       ! Error code:
                                          ! 0 on success and -1 on failure
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lapl_id ! Link access property list
+    LOGICAL, INTENT(OUT), OPTIONAL :: mounted      ! Whether group has a file mounted on it
 
+    INTEGER :: mounted_c
     INTEGER(HID_T) :: lapl_id_default 
     INTEGER(SIZE_T) :: group_name_len ! length of group name
 
@@ -1393,7 +1428,7 @@ CONTAINS
 !
     INTERFACE
        INTEGER FUNCTION h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
-            storage_type, nlinks, max_corder)
+            storage_type, nlinks, max_corder, mounted_c)
          USE H5GLOBAL
          !DEC$ IF DEFINED(HDF5F90_WINDOWS)
          !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5GGET_INFO_BY_NAME_C'::h5gget_info_by_name_c
@@ -1406,6 +1441,7 @@ CONTAINS
          INTEGER, INTENT(OUT) :: max_corder
 
          INTEGER(SIZE_T) :: group_name_len
+         INTEGER :: mounted_c
 
        END FUNCTION h5gget_info_by_name_c
     END INTERFACE
@@ -1416,7 +1452,15 @@ CONTAINS
     IF(PRESENT(lapl_id)) lapl_id_default = lapl_id
 
     hdferr = h5gget_info_by_name_c(loc_id, group_name, group_name_len, lapl_id_default, &
-         storage_type, nlinks, max_corder)
+         storage_type, nlinks, max_corder, mounted_c)
+
+    IF(PRESENT(mounted))THEN
+       IF(mounted_c.EQ.0) THEN 
+          mounted = .FALSE.
+       ELSE 
+          mounted = .TRUE.
+       ENDIF
+    ENDIF
     
   END SUBROUTINE h5gget_info_by_name_f
 
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index 3f8f361..af86372 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -339,7 +339,7 @@ H5_FCDLL int_f nh5dfill_real_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f
 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); /*MSB*/
+				  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); /*MSB*/
-H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id ); /*MSB*/
-H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/
+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); /*MSB*/
+				     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); /*MSB*/
+				      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) /* MSB */
-#   define nh5arename_by_name_c H5_FC_FUNC_(h5arename_by_name_c, H5ARENAME_BY_NAME_C) /* MSB */
-#   define nh5aopen_c H5_FC_FUNC_(h5aopen_c, H5AOPEN_C) /* MSB */
-#   define nh5adelete_by_name_c H5_FC_FUNC_(h5adelete_by_name_c,H5ADELETE_BY_NAME_C) /* MSB */
-#   define nh5adelete_by_idx_c H5_FC_FUNC_(h5adelete_by_idx_c,H5ADELETE_BY_IDX_C) /* MSB */
-#   define nh5aget_name_by_idx_c H5_FC_FUNC_(h5aget_name_by_idx_c,H5AGET_NAME_BY_IDX_C) /* MSB */
-#   define nh5aget_create_plist_c H5_FC_FUNC_(h5aget_create_plist_c,H5AGET_CREATE_PLIST_C) /* MSB */
-#   define nh5aopen_by_idx_c H5_FC_FUNC_(h5aopen_by_idx_c,H5AOPEN_BY_IDX_C) /* MSB */
-#   define nh5aget_info_c H5_FC_FUNC_(h5aget_info_c,H5AGET_INFO_C) /* MSB */
-#   define nh5aget_info_by_idx_c H5_FC_FUNC_(h5aget_info_by_idx_c,H5AGET_INFO_BY_IDX_C) /* MSB */
-#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) /* MSB */
-#   define nh5aget_info_by_name_c H5_FC_FUNC_(h5aget_info_by_name_c,H5AGET_INFO_BY_NAME_C) /* MSB */
-#   define nh5acreate_by_name_c H5_FC_FUNC_(h5acreate_by_name_c,H5ACREATE_BY_NAME_C) /* MSB */
-#   define nh5aexists_c H5_FC_FUNC_(h5aexists_c,H5AEXISTS_C) /* MSB */
-#   define nh5aexists_by_name_c H5_FC_FUNC_(h5aexists_by_name_c,H5AEXISTS_BY_NAME_C) /* MSB */
-#   define nh5aopen_by_name_c H5_FC_FUNC_(h5aopen_by_name_c,H5AOPEN_BY_NAME_C) /* MSB */
-#   define nh5arename_c H5_FC_FUNC_(h5arename_c,H5ARENAME_C) /* MSB */
+#   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 ); /* MSB */
+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 ); /* MSB */
+				      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); /* MSB */
+			    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); /* MSB */
+				     _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); /* MSB */
+				    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); /* MSB */
-H5_FCDLL int_f nh5aget_create_plist_c ( hid_t_f *attr_id, hid_t_f *creation_prop_id ); /* MSB */
+				      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); /* MSB */
+		     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 ); /* MSB */
+			       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 ); /* MSB */
+				      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 ); /* MSB */
+				       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 ); /* MSB */
-H5_FCDLL int_f nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists); /* MSB */
+				    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); /* MSB */
+		      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); /* MSB */
+				   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); /* MSB */
+		      _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) /* MSB */
-#   define nh5pset_attr_creation_order_c  H5_FC_FUNC_(h5pset_attr_creation_order_c, H5PSET_ATTR_CREATION_ORDER_C) /* MSB */
-#   define nh5pset_shared_mesg_nindexes_c  H5_FC_FUNC_(h5pset_shared_mesg_nindexes_c, H5PSET_SHARED_MESG_NINDEXES_C) /* MSB */
-#   define nh5pset_shared_mesg_index_c  H5_FC_FUNC_(h5pset_shared_mesg_index_c,H5PSET_SHARED_MESG_INDEX_C) /* MSB */
-#   define nh5pget_attr_creation_order_c  H5_FC_FUNC_(h5pget_attr_creation_order_c,H5PGET_ATTR_CREATION_ORDER_C) /* MSB */
-#   define nh5pset_libver_bounds_c H5_FC_FUNC_(h5pset_libver_bounds_c,H5PSET_LIBVER_BOUNDS_C) /* MSB */
-#   define nh5pset_link_creation_order_c H5_FC_FUNC_(h5pset_link_creation_order_c, H5PSET_LINK_CREATION_ORDER_C) /* MSB */
-#   define nh5pget_link_phase_change_c H5_FC_FUNC_(h5pget_link_phase_change_c, H5PGET_LINK_PHASE_CHANGE_C) /* MSB */
-#   define nh5pget_obj_track_times_c H5_FC_FUNC_(h5pget_obj_track_times_c, H5PGET_OBJ_TRACK_TIMES_C) /* MSB */
-#   define nh5pset_obj_track_times_c H5_FC_FUNC_(h5pset_obj_track_times_c, H5PSET_OBJ_TRACK_TIMES_C) /* MSB */
-#   define nh5pset_create_inter_group_c H5_FC_FUNC_(h5pset_create_inter_group_c,H5PSET_CREATE_INTER_GROUP_C) /* MSB */
-#   define nh5pget_create_inter_group_c H5_FC_FUNC_(h5pget_create_inter_group_c,H5PGET_CREATE_INTER_GROUP_C) /* MSB */
-#   define nh5pget_link_creation_order_c H5_FC_FUNC_(h5pget_link_creation_order_c,H5PGET_LINK_CREATION_ORDER_C) /* MSB */
-#   define nh5pset_char_encoding_c H5_FC_FUNC_(h5pset_char_encoding_c, H5PSET_CHAR_ENCODING_C) /* MSB */
-#   define nh5pget_char_encoding_c H5_FC_FUNC_(h5pget_char_encoding_c, H5PGET_CHAR_ENCODING_C) /* MSB */
-#   define nh5pset_copy_object_c H5_FC_FUNC_(h5pset_copy_object_c, H5PSET_COPY_OBJECT_C) /* MSB */
-#   define nh5pget_copy_object_c H5_FC_FUNC_(h5pget_copy_object_c, H5PGET_COPY_OBJECT_C) /* MSB */
-#   define nh5pget_data_transform_c H5_FC_FUNC_(h5pget_data_transform_c, H5PGET_DATA_TRANSFORM_C) /* MSB */
-#   define nh5pset_data_transform_c H5_FC_FUNC_(h5pset_data_transform_c, H5PSET_DATA_TRANSFORM_C) /* MSB */
-#   define nh5pget_local_heap_size_hint_c H5_FC_FUNC_(h5pget_local_heap_size_hint_c, H5PGET_LOCAL_HEAP_SIZE_HINT_C) /* MSB */
-#   define nh5pget_est_link_info_c H5_FC_FUNC_(h5pget_est_link_info_c,H5PGET_EST_LINK_INFO_C) /* MSB */
-#   define nh5pset_est_link_info_c H5_FC_FUNC_(h5pset_est_link_info_c,H5PSET_EST_LINK_INFO_C) /* MSB */
-#   define nh5pset_local_heap_size_hint_c H5_FC_FUNC_(h5pset_local_heap_size_hint_c, H5PSET_LOCAL_HEAP_SIZE_HINT_C) /* MSB */
-#   define nh5pset_link_phase_change_c H5_FC_FUNC_(h5pset_link_phase_change_c, H5PSET_LINK_PHASE_CHANGE_C) /* MSB */
-#   define nh5pset_fapl_direct_c H5_FC_FUNC_(h5pset_fapl_direct_c, H5PSET_FAPL_DIRECT_C) /* MSB */
-#   define nh5pget_fapl_direct_c H5_FC_FUNC_(h5pget_fapl_direct_c, H5PGET_FAPL_DIRECT_C) /* MSB */
-#   define nh5pset_attr_phase_change_c H5_FC_FUNC_(h5pset_attr_phase_change_c, H5PSET_ATTR_PHASE_CHANGE_C) /* MSB */
-#   define nh5pset_nbit_c H5_FC_FUNC_(h5pset_nbit_c, H5PSET_NBIT_C) /* MSB */
-#   define nh5pset_scaleoffset_c H5_FC_FUNC_(h5pset_scaleoffset_c, H5PSET_SCALEOFFSET_C) /* MSB */
-#   define nh5pset_nlinks_c H5_FC_FUNC_(h5pset_nlinks_c, H5PSET_NLINKS_C) /* MSB */
-#   define nh5pget_nlinks_c H5_FC_FUNC_(h5pget_nlinks_c, H5PGET_NLINKS_C) /* MSB */
+#   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 ); /* MSB */
-H5_FCDLL int_f nh5pset_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags ); /* MSB */
-H5_FCDLL int_f nh5pset_shared_mesg_nindexes_c(hid_t_f *plist_id, int_f *nindexes ); /* MSB */
-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); /* MSB */
-H5_FCDLL int_f nh5pget_attr_creation_order_c(hid_t_f *ocpl_id, int_f *crt_order_flags); /* MSB */
-H5_FCDLL int_f nh5pset_libver_bounds_c(hid_t_f *fapl_id, int_f *low, int_f *high); /* MSB */
-H5_FCDLL int_f nh5pset_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); /* MSB */
-H5_FCDLL int_f nh5pget_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
-H5_FCDLL int_f nh5pget_obj_track_times_c(hid_t_f *plist_id, int_f *flag); /* MSB */
-H5_FCDLL int_f nh5pset_obj_track_times_c(hid_t_f *plist_id, int_f *flag); /* MSB */
-H5_FCDLL int_f nh5pset_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); /* MSB */
-H5_FCDLL int_f nh5pget_create_inter_group_c(hid_t_f *lcpl_id, int_f *crt_intermed_group); /* MSB */
-H5_FCDLL int_f nh5pget_link_creation_order_c(hid_t_f *gcpl_id, int_f *crt_order_flags); /* MSB */
-H5_FCDLL int_f nh5pset_char_encoding_c(hid_t_f *plist_id, int_f *encoding); /* MSB */
-H5_FCDLL int_f nh5pget_char_encoding_c(hid_t_f *plist_id, int_f *encoding); /* MSB */
-H5_FCDLL int_f nh5pset_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); /* MSB */
-H5_FCDLL int_f nh5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options); /* MSB */
-H5_FCDLL int_f nh5pget_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len, size_t_f *size); /* MSB */
-H5_FCDLL int_f nh5pset_data_transform_c(hid_t_f *plist_id, _fcd expression, int_f *expression_len); /* MSB */
-H5_FCDLL int_f nh5pget_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); /* MSB */
-H5_FCDLL int_f nh5pget_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); /* MSB */
-H5_FCDLL int_f nh5pset_local_heap_size_hint_c(hid_t_f *gcpl_id, size_t_f *size_hint); /* MSB */
-H5_FCDLL int_f nh5pset_est_link_info_c(hid_t_f *gcpl_id, int_f *est_num_entries, int_f *est_name_len); /* MSB */
-H5_FCDLL int_f nh5pset_link_phase_change_c(hid_t_f *gcpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
-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 ); /* MSB */
-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 ); /* MSB */
-H5_FCDLL int_f nh5pset_attr_phase_change_c (hid_t_f *ocpl_id, int_f *max_compact, int_f *min_dense ); /* MSB */
-H5_FCDLL int_f nh5pset_nbit_c(hid_t_f *plist_id ); /* MSB */
-H5_FCDLL int_f nh5pset_scaleoffset_c(hid_t_f *plist_id, int_f *scale_type, int_f *scale_factor ); /* MSB */
-H5_FCDLL int_f nh5pset_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); /* MSB */
-H5_FCDLL int_f nh5pget_nlinks_c(hid_t_f *lapl_id, size_t_f *nlinks); /* MSB */
+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,51 +1158,51 @@ 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) /*MSB*/
-# define nh5lcreate_external_c H5_FC_FUNC_(h5lcreate_external_c, H5LCREATE_EXTERNAL_C) /*MSB*/
-# define nh5lcreate_hard_c H5_FC_FUNC_(h5lcreate_hard_c, H5LCREATE_HARD_C) /*MSB*/
-# define nh5lcreate_soft_c H5_FC_FUNC_(h5lcreate_soft_c, H5LCREATE_SOFT_C) /*MSB*/
-# define nh5ldelete_c H5_FC_FUNC_(h5ldelete_c, H5LDELETE_C) /*MSB*/
-# define nh5ldelete_by_idx_c H5_FC_FUNC_(h5ldelete_by_idx_c, H5LDELETE_BY_IDX_C) /*MSB*/
-# define nh5lexists_c H5_FC_FUNC_(h5lexists_c, H5LEXISTS_C) /*MSB*/
-# define nh5lget_info_c H5_FC_FUNC_(h5lget_info_c, H5LGET_INFO_C) /*MSB*/
-# define nh5lget_info_by_idx_c H5_FC_FUNC_(h5lget_info_by_idx_c, H5LGET_INFO_BY_IDX_C) /*MSB*/
-# define nh5lis_registered_c H5_FC_FUNC_(h5lis_registered_c, H5LIS_REGISTERED_C) /*MSB*/
-# define nh5lmove_c H5_FC_FUNC_(h5lmove_c, H5LMOVE_C) /* MSB */
-# define nh5lget_name_by_idx_c H5_FC_FUNC_(h5lget_name_by_idx_c, H5LGET_NAME_BY_IDX_C) /* MSB */
-# define nh5lget_val_c H5_FC_FUNC_(h5lget_val_c, H5LGET_VAL_C) /* MSB */
+# 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, 
 			  _fcd dest_name, size_t_f *dest_namelen,
-			  hid_t_f *lcpl_id, hid_t_f *lapl_id); /*MSB*/
+			  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); /*MSB*/
+				     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 ); /*MSB*/
+				 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 ); /*MSB*/
-H5_FCDLL int_f nh5ldelete_c( hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id ); /*MSB*/
+				 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); /*MSB*/
-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); /*MSB*/
+				    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 *address, hsize_t_f *link_len,
-			       hid_t_f *lapl_id); /*MSB*/
+			       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); /*MSB*/
-H5_FCDLL int_f nh5lis_registered_c(int_f *link_cls_id); /*MSB*/
+				     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); /*MSB*/
+			  _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); /*MSB*/
+				     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) ;
 
diff --git a/fortran/src/H5test_kind.f90 b/fortran/src/H5test_kind.f90
index 802d8f9..db7178e 100644
--- a/fortran/src/H5test_kind.f90
+++ b/fortran/src/H5test_kind.f90
@@ -17,131 +17,131 @@
 ! This fortran program generates H5fortran_detect.f90
 ! 
 !
-         program test_kind
-         integer :: i, j, ii, last, kind_numbers(10)
-         integer :: jr, jd
+         PROGRAM test_kind
+         INTEGER :: i, j, ii, last, kind_numbers(10)
+         INTEGER :: jr, jd
          last = -1
          ii = 0
-         j = selected_int_kind(18)
+         j = SELECTED_INT_KIND(18)
 !         write(*,*) j
-         do i = 1,100
-            j = selected_int_kind(i)
-            if(j .ne. last) then
-              if(last .ne. -1) then
+         DO i = 1,100
+            j = SELECTED_INT_KIND(i)
+            IF(j .NE. last) THEN
+              IF(last .NE. -1) THEN
                   ii = ii + 1
                   kind_numbers(ii) = last
-              endif
+              ENDIF
             last = j
-            if(j .eq. -1) exit
-            endif
-          enddo
+            IF(j .EQ. -1) EXIT
+            ENDIF
+          ENDDO
 !          write(*,*) kind_numbers(1:ii)
 ! Generate a program
-          write(*,*) "program int_kind"
-          write(*,*) "write(*,*) "" /*generating header file*/ """
+          WRITE(*,*) "program int_kind"
+          WRITE(*,*) "write(*,*) "" /*generating header file*/ """
              j = 0
-             write(*, "("" call i"", i2.2,""()"")") j
+             WRITE(*, "("" call i"", i2.2,""()"")") j
              jr = 0
-             write(*, "("" call r"", i2.2,""()"")") jr
+             WRITE(*, "("" call r"", i2.2,""()"")") jr
              jd = 0
-             write(*, "("" call d"", i2.2,""()"")") jd
-          do i = 1, ii
+             WRITE(*, "("" call d"", i2.2,""()"")") jd
+          DO i = 1, ii
              j = kind_numbers(i)
-             write(*, "("" call i"", i2.2,""()"")") j
-          enddo
-          write(*,*) "end program int_kind"
+             WRITE(*, "("" call i"", i2.2,""()"")") j
+          ENDDO
+          WRITE(*,*) "end program int_kind"
               j = 0
-             write(*, "("" subroutine i"" i2.2,""()"")") j
-             write(*,*)"   implicit none"
-             write(*,*)"   integer :: a = 0"
-             write(*,*)"   integer :: a_size"
-             write(*,*)"   a_size = bit_size(a)"
-             write(*,*)"   if (a_size .eq. 8) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_1"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 16) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_2"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 32) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_4"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 64) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_8"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 128) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_16"" "
-             write(*,*)"   endif"
-             write(*,*)"   return"
-             write(*,*)"   end subroutine"    
+             WRITE(*, "("" subroutine i"", i2.2,""()"")") j
+             WRITE(*,*)"   implicit none"
+             WRITE(*,*)"   integer :: a = 0"
+             WRITE(*,*)"   integer :: a_size"
+             WRITE(*,*)"   a_size = bit_size(a)"
+             WRITE(*,*)"   if (a_size .eq. 8) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_1"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 16) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_2"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 32) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_4"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 64) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_8"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 128) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_NATIVE_16"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   return"
+             WRITE(*,*)"   end subroutine"    
               jr = 0
-             write(*, "("" subroutine r"" i2.2,""()"")") j
-             write(*,*)"   implicit none"
-             write(*,*)"   real :: b(1) = 0"
-             write(*,*)"   integer :: a(1) = 0"
-             write(*,*)"   integer :: a_size"
-             write(*,*)"   integer :: real_size"
-             write(*,*)"   integer :: ab_size ! How many integers needed to hold a real"
-             write(*,*)"   integer :: ba_size ! How many reals needed to hold an integer"
-             write(*,*)"   a_size = bit_size(a(1)) ! Size in bits for integer"
-             write(*,*)"   ab_size = size(transfer(b,a))"
-             write(*,*)"   ba_size = size(transfer(a,b))"
-             write(*,*)"   if (ab_size .eq. ba_size) real_size=a_size"
-             write(*,*)"   if (ab_size .gt. ba_size) real_size=a_size*ba_size"
-             write(*,*)"   if (ab_size .lt. ba_size) real_size=a_size/ba_size"
-             write(*,*)"   if (real_size .eq. 32) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_4"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (real_size .eq. 64) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_8"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (real_size .eq. 128) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_16"" "
-             write(*,*)"   endif"
-             write(*,*)"   return"
-             write(*,*)"   end subroutine"    
+             WRITE(*, "("" subroutine r"", i2.2,""()"")") j
+             WRITE(*,*)"   implicit none"
+             WRITE(*,*)"   real :: b(1) = 0"
+             WRITE(*,*)"   integer :: a(1) = 0"
+             WRITE(*,*)"   integer :: a_size"
+             WRITE(*,*)"   integer :: real_size"
+             WRITE(*,*)"   integer :: ab_size ! How many integers needed to hold a real"
+             WRITE(*,*)"   integer :: ba_size ! How many reals needed to hold an integer"
+             WRITE(*,*)"   a_size = bit_size(a(1)) ! Size in bits for integer"
+             WRITE(*,*)"   ab_size = size(transfer(b,a))"
+             WRITE(*,*)"   ba_size = size(transfer(a,b))"
+             WRITE(*,*)"   if (ab_size .eq. ba_size) real_size=a_size"
+             WRITE(*,*)"   if (ab_size .gt. ba_size) real_size=a_size*ba_size"
+             WRITE(*,*)"   if (ab_size .lt. ba_size) real_size=a_size/ba_size"
+             WRITE(*,*)"   if (real_size .eq. 32) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_4"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (real_size .eq. 64) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_8"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (real_size .eq. 128) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_REAL_NATIVE_16"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   return"
+             WRITE(*,*)"   end subroutine"    
               jd = 0
-             write(*, "("" subroutine d"" i2.2,""()"")") jd
-             write(*,*)"   implicit none"
-             write(*,*)"   double precision :: b = 0"
-             write(*,*)"   integer :: a(8) = 0"
-             write(*,*)"   integer :: a_size"
-             write(*,*)"   integer :: b_size"
-             write(*,*)"   a_size = bit_size(a(1))"
-             write(*,*)"   b_size = size(transfer(b,a))*a_size"
-             write(*,*)"   if (b_size .eq. 64) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_DOUBLE_NATIVE_8"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (b_size .eq. 128) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_DOUBLE_NATIVE_16"" "
-             write(*,*)"   endif"
-             write(*,*)"   return"
-             write(*,*)"   end subroutine"    
-          do i = 1, ii
+             WRITE(*, "("" subroutine d"", i2.2,""()"")") jd
+             WRITE(*,*)"   implicit none"
+             WRITE(*,*)"   double precision :: b = 0"
+             WRITE(*,*)"   integer :: a(8) = 0"
+             WRITE(*,*)"   integer :: a_size"
+             WRITE(*,*)"   integer :: b_size"
+             WRITE(*,*)"   a_size = bit_size(a(1))"
+             WRITE(*,*)"   b_size = size(transfer(b,a))*a_size"
+             WRITE(*,*)"   if (b_size .eq. 64) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_DOUBLE_NATIVE_8"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (b_size .eq. 128) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_DOUBLE_NATIVE_16"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   return"
+             WRITE(*,*)"   end subroutine"    
+          DO i = 1, ii
               j = kind_numbers(i)
-             write(*, "("" subroutine i"" i2.2,""()"")") j
-             write(*,*)"   implicit none"
-             write(*,*)"   integer(",j,") :: a = 0"
-             write(*,*)"   integer :: a_size"
-             write(*,*)"   a_size = bit_size(a)"
-             write(*,*)"   if (a_size .eq. 8) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_1"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 16) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_2"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 32) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_4"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 64) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_8"" "
-             write(*,*)"   endif"
-             write(*,*)"   if (a_size .eq. 128) then"
-             write(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_16"" "
-             write(*,*)"   endif"
-             write(*,*)"   return"
-             write(*,*)"   end subroutine"    
-          enddo
-          end program
+             WRITE(*, "("" subroutine i"", i2.2,""()"")") j
+             WRITE(*,*)"   implicit none"
+             WRITE(*,*)"   integer(",j,") :: a = 0"
+             WRITE(*,*)"   integer :: a_size"
+             WRITE(*,*)"   a_size = bit_size(a)"
+             WRITE(*,*)"   if (a_size .eq. 8) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_1"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 16) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_2"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 32) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_4"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 64) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_8"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   if (a_size .eq. 128) then"
+             WRITE(*,*)"       write(*,*) ""#define H5_FORTRAN_HAS_INTEGER_16"" "
+             WRITE(*,*)"   endif"
+             WRITE(*,*)"   return"
+             WRITE(*,*)"   end subroutine"    
+          ENDDO
+          END PROGRAM