[svn-r16947] 1. #1522 (B1) h5ltread_dataset_string_f error with g95

ISSUE: h5ltread_dataset_string_f causes library assertion with g95. 
SOLUTION: convert the fortran string buffer to a C buffer with HD5f2cstring, and pass this string to the C function
TEST: added a test call in the fortran test lite program
DOCS: added the note in RELEASE.txt "- Lite: the h5ltread_dataset_string_f and h5ltget_attribute_string_f functions had memory problems with the g95 fortran compiler. (PVN - 5/13/2009) 1522

1 files changed, 511 insertions, 509 deletions

diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index 247a3e6..8a9d6c0 100755
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -1,17 +1,17 @@
- /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
- * All rights reserved.                                                      *
- *                                                                           *
- * This file is part of HDF5.  The full HDF5 copyright notice, including     *
- * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+* Copyright by The HDF Group.                                               *
+* Copyright by the Board of Trustees of the University of Illinois.         *
+* All rights reserved.                                                      *
+*                                                                           *
+* This file is part of HDF5.  The full HDF5 copyright notice, including     *
+* terms governing use, modification, and redistribution, is contained in    *
+* the files COPYING and Copyright.html.  COPYING can be found at the root   *
+* of the source code distribution tree; Copyright.html can be found at the  *
+* root level of an installed copy of the electronic HDF5 document set and   *
+* is linked from the top-level documents page.  It can also be found at     *
+* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
+* access to either file, you may request a copy from help@hdfgroup.org.     *
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 
 #ifndef _H5LTf90proto_H
@@ -28,8 +28,8 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len);
 
 
 /*
- *  Functions from H5LTfc.c
- */
+*  Functions from H5LTfc.c
+*/
 #   define nh5ltmake_dataset_c       H5_FC_FUNC_(h5ltmake_dataset_c, H5LTMAKE_DATASET_C)
 #   define nh5ltmake_dataset_int1_c  H5_FC_FUNC_(h5ltmake_dataset_int1_c, H5LTMAKE_DATASET_INT1_C)
 #   define nh5ltmake_dataset_int2_c  H5_FC_FUNC_(h5ltmake_dataset_int2_c, H5LTMAKE_DATASET_INT2_C)
@@ -89,9 +89,9 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len);
 #   define nh5ltget_attribute_info_c   H5_FC_FUNC_(h5ltget_attribute_info_c, H5LTGET_ATTRIBUTE_INFO_C)
 
 /*-------------------------------------------------------------------------
- * Image
- *-------------------------------------------------------------------------
- */
+* Image
+*-------------------------------------------------------------------------
+*/
 #   define nh5immake_image_8bit_c      H5_FC_FUNC_(h5immake_image_8bit_c, H5IMMAKE_IMAGE_8BIT_C)
 #   define nh5immake_image_24bit_c     H5_FC_FUNC_(h5immake_image_24bit_c, H5IMMAKE_IMAGE_24BIT_C)
 #   define nh5imread_image_c           H5_FC_FUNC_(h5imread_image_c, H5IMREAD_IMAGE_C)
@@ -106,9 +106,9 @@ H5_DLL void HD5packFstring (char *src, char *dest, size_t len);
 #   define nh5imis_palette_c           H5_FC_FUNC_(h5imis_palette_c, H5IMIS_PALETTE_C)
 
 /*-------------------------------------------------------------------------
- * Table
- *-------------------------------------------------------------------------
- */
+* Table
+*-------------------------------------------------------------------------
+*/
 #   define nh5tbmake_table_c           H5_FC_FUNC_(h5tbmake_table_c, H5TBMAKE_TABLE_C)
 #   define nh5tbwrite_field_name_c     H5_FC_FUNC_(h5tbwrite_field_name_c, H5TBWRITE_FIELD_NAME_C)
 #   define nh5tbwrite_field_name_int_c    H5_FC_FUNC_(h5tbwrite_field_name_int_c, H5TBWRITE_FIELD_NAME_INT_C)
@@ -152,182 +152,182 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
 H5_DLL
 int_f
 nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank,
+                         hsize_t_f *dims,
+                         hid_t_f *type_id,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank,
+                         hsize_t_f *dims,
+                         hid_t_f *type_id,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank,
+                         hsize_t_f *dims,
+                         hid_t_f *type_id,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank,
+                         hsize_t_f *dims,
+                         hid_t_f *type_id,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank,
+                         hsize_t_f *dims,
+                         hid_t_f *type_id,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank,
+                         hsize_t_f *dims,
+                         hid_t_f *type_id,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *rank,
+                           hsize_t_f *dims,
+                           hid_t_f *type_id,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *rank,
+                           hsize_t_f *dims,
+                           hid_t_f *type_id,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *rank,
+                           hsize_t_f *dims,
+                           hid_t_f *type_id,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *rank,
-                     hsize_t_f *dims,
-                     hid_t_f *type_id,
-                     void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *rank,
+                          hsize_t_f *dims,
+                          hid_t_f *type_id,
+                          void *buf);
 
 H5_DLL
 int_f
@@ -336,253 +336,254 @@ nh5ltread_dataset_c (hid_t_f *loc_id,
                      _fcd name,
                      hid_t_f *type_id,
                      void *buf,
-		     hsize_t_f *dims);
+                     hsize_t_f *dims);
 
 
 H5_DLL
 int_f
 nh5ltread_dataset_int1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_int2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_int3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     hid_t_f *type_id,
-                     void *buf,
-		     hsize_t_f *dims);
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5ltset_attribute_int_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          size_t_f *size,
-																										void *buf);
+                         int_f *namelen,
+                         _fcd dsetname,
+                         int_f *attrnamelen,
+                         _fcd attrname,
+                         size_t_f *size,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltset_attribute_float_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          size_t_f *size,
-																										void *buf);
+                           int_f *namelen,
+                           _fcd dsetname,
+                           int_f *attrnamelen,
+                           _fcd attrname,
+                           size_t_f *size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5ltset_attribute_double_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          size_t_f *size,
-																										void *buf);
+                            int_f *namelen,
+                            _fcd dsetname,
+                            int_f *attrnamelen,
+                            _fcd attrname,
+                            size_t_f *size,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5ltset_attribute_string_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-																										void *buf);
+                            int_f *namelen,
+                            _fcd dsetname,
+                            int_f *attrnamelen,
+                            _fcd attrname,
+                            int_f *buflen,
+                            void *buf);
 
 
 H5_DLL
 int_f
 nh5ltget_attribute_int_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          void *buf);
+                         int_f *namelen,
+                         _fcd dsetname,
+                         int_f *attrnamelen,
+                         _fcd attrname,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5ltget_attribute_float_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          void *buf);
+                           int_f *namelen,
+                           _fcd dsetname,
+                           int_f *attrnamelen,
+                           _fcd attrname,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5ltget_attribute_double_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          void *buf);
+                            int_f *namelen,
+                            _fcd dsetname,
+                            int_f *attrnamelen,
+                            _fcd attrname,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5ltget_attribute_string_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-                          void *buf);
+                            int_f *namelen,
+                            _fcd dsetname,
+                            int_f *attrnamelen,
+                            _fcd attrname,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                       _fcd name,
-                       int_f *rank);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *rank);
 
 H5_DLL
 int_f
@@ -595,34 +596,35 @@ int_f
 nh5ltget_dataset_info_c(hid_t_f *loc_id,
                         int_f *namelen,
                         _fcd name,
-																								hsize_t_f *dims,
+                        hsize_t_f *dims,
                         int_f *type_class,
-																								size_t_f *type_size);
+                        size_t_f *type_size);
 
 H5_DLL
 int_f
 nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                          int_f *namelen,
-                          _fcd dsetname,
-																										int_f *attrnamelen,
-                          _fcd attrname,
-																					     int_f *rank);
+                           int_f *namelen,
+                           _fcd dsetname,
+                           int_f *attrnamelen,
+                           _fcd attrname,
+                           int_f *rank);
 H5_DLL
 int_f
 nh5ltget_attribute_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-																								int_f *attrnamelen,
-                        _fcd attrname,
-																								hsize_t_f *dims,
-                        int_f *type_class,
-																								size_t_f *type_size);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *attrnamelen,
+                          _fcd attrname,
+                          hsize_t_f *dims,
+                          int_f *type_class,
+                          size_t_f *type_size);
 
 H5_DLL
 int_f
 nh5ltmake_dataset_string_c (hid_t_f *loc_id,
                             int_f *namelen,
                             _fcd name,
+                            int_f *buflen,
                             char *buf);
 
 H5_DLL
@@ -633,18 +635,18 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id,
                             char *buf);
 
 /*-------------------------------------------------------------------------
- * Image
- *-------------------------------------------------------------------------
- */
+* Image
+*-------------------------------------------------------------------------
+*/
 
 H5_DLL
 int_f
 nh5immake_image_8bit_c (hid_t_f *loc_id,
-                       int_f *namelen,
-                       _fcd name,
-                       hsize_t_f *width,
-                       hsize_t_f *height,
-                       int_f *buf);
+                        int_f *namelen,
+                        _fcd name,
+                        hsize_t_f *width,
+                        hsize_t_f *height,
+                        int_f *buf);
 H5_DLL
 int_f
 nh5imread_image_c (hid_t_f *loc_id,
@@ -657,22 +659,22 @@ int_f
 nh5immake_image_24bit_c (hid_t_f *loc_id,
                          int_f *namelen,
                          _fcd name,
-																										int_f *ilen,
+                         int_f *ilen,
                          _fcd il,
                          hsize_t_f *width,
                          hsize_t_f *height,
-																								 void *buf);
+                         void *buf);
 H5_DLL
 int_f
 nh5imget_image_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-																								hsize_t_f *width,
-																								hsize_t_f *height,
-																								hsize_t_f *planes,
-																								hsize_t_f *npals,
-                        int_f *ilen,
-                       _fcd interlace);
+                      int_f *namelen,
+                      _fcd name,
+                      hsize_t_f *width,
+                      hsize_t_f *height,
+                      hsize_t_f *planes,
+                      hsize_t_f *npals,
+                      int_f *ilen,
+                      _fcd interlace);
 
 
 H5_DLL
@@ -701,71 +703,71 @@ nh5imlink_palette_c (hid_t_f *loc_id,
 H5_DLL
 int_f
 nh5imunlink_palette_c (hid_t_f *loc_id,
-                     int_f *namelen,
-                     _fcd name,
-                     int_f *ilen,
-                     _fcd pal_name);
+                       int_f *namelen,
+                       _fcd name,
+                       int_f *ilen,
+                       _fcd pal_name);
 
 H5_DLL
 int_f
 nh5imget_npalettes_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-																								hsize_t_f *npals);
+                     int_f *namelen,
+                     _fcd name,
+                     hsize_t_f *npals);
 
 
 H5_DLL
 int_f
 nh5imget_palette_info_c(hid_t_f *loc_id,
                         int_f *namelen,
-                       _fcd name,
-																							int_f *pal_number,
-																					  hsize_t_f *dims);
+                        _fcd name,
+                        int_f *pal_number,
+                        hsize_t_f *dims);
 
 H5_DLL
 int_f
 nh5imget_palette_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-																							 int_f *pal_number,
-																					   void *buf);
+                   int_f *namelen,
+                   _fcd name,
+                   int_f *pal_number,
+                   void *buf);
 
 H5_DLL
 int_f
 nh5imis_palette_c(hid_t_f *loc_id,
                   int_f *namelen,
-                 _fcd name);
+                  _fcd name);
 
 
 
 /*-------------------------------------------------------------------------
- * Table
- *-------------------------------------------------------------------------
- */
+* Table
+*-------------------------------------------------------------------------
+*/
 
 H5_DLL
 int_f
 nh5tbmake_table_c(int_f *namelen1,
-		_fcd name1,
-		hid_t_f *loc_id,
-                int_f *namelen,
-                _fcd name,
-                hsize_t_f *nfields,
-                hsize_t_f *nrecords,
-		size_t_f *type_size,
-	       	size_t_f *field_offset,
-	        hid_t_f *field_types,
-		hsize_t_f *chunk_size,
-		int_f *compress,
-		int_f *len,       /* field_names lenghts */
-		_fcd buf);          /* field_names */
+                  _fcd name1,
+                  hid_t_f *loc_id,
+                  int_f *namelen,
+                  _fcd name,
+                  hsize_t_f *nfields,
+                  hsize_t_f *nrecords,
+                  size_t_f *type_size,
+                  size_t_f *field_offset,
+                  hid_t_f *field_types,
+                  hsize_t_f *chunk_size,
+                  int_f *compress,
+                  int_f *len,       /* field_names lenghts */
+                  _fcd buf);          /* field_names */
 
 H5_DLL
 int_f
 nh5tbwrite_field_name_c(hid_t_f *loc_id,
                         int_f *namelen,
                         _fcd name,
-	         	int_f *namelen1,
+                        int_f *namelen1,
                         _fcd field_name,
                         hsize_t_f *start,
                         hsize_t_f *nrecords,
@@ -775,165 +777,165 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id,
 H5_DLL
 int_f
 nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                            int_f *namelen,
+                            _fcd name,
+                            int_f *namelen1,
+                            _fcd field_name,
+                            hsize_t_f *start,
+                            hsize_t_f *nrecords,
+                            size_t_f *type_size,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *namelen1,
+                           _fcd field_name,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *namelen1,
+                           _fcd field_name,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *namelen1,
+                           _fcd field_name,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_name_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                       int_f *namelen,
+                       _fcd name,
+                       int_f *namelen1,
+                       _fcd field_name,
+                       hsize_t_f *start,
+                       hsize_t_f *nrecords,
+                       size_t_f *type_size,
+                       void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_name_int_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *namelen1,
+                           _fcd field_name,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_name_fl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *namelen1,
+                          _fcd field_name,
+                          hsize_t_f *start,
+                          hsize_t_f *nrecords,
+                          size_t_f *type_size,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_name_dl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *namelen1,
+                          _fcd field_name,
+                          hsize_t_f *start,
+                          hsize_t_f *nrecords,
+                          size_t_f *type_size,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_name_st_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-		        int_f *namelen1,
-                        _fcd field_name,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                          int_f *namelen,
+                          _fcd name,
+                          int_f *namelen1,
+                          _fcd field_name,
+                          hsize_t_f *start,
+                          hsize_t_f *nrecords,
+                          size_t_f *type_size,
+                          void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_index_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                         int_f *namelen,
+                         _fcd name,
+                         int_f *field_index,
+                         hsize_t_f *start,
+                         hsize_t_f *nrecords,
+                         size_t_f *type_size,
+                         void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                             int_f *namelen,
+                             _fcd name,
+                             int_f *field_index,
+                             hsize_t_f *start,
+                             hsize_t_f *nrecords,
+                             size_t_f *type_size,
+                             void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                            int_f *namelen,
+                            _fcd name,
+                            int_f *field_index,
+                            hsize_t_f *start,
+                            hsize_t_f *nrecords,
+                            size_t_f *type_size,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                            int_f *namelen,
+                            _fcd name,
+                            int_f *field_index,
+                            hsize_t_f *start,
+                            hsize_t_f *nrecords,
+                            size_t_f *type_size,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                            int_f *namelen,
+                            _fcd name,
+                            int_f *field_index,
+                            hsize_t_f *start,
+                            hsize_t_f *nrecords,
+                            size_t_f *type_size,
+                            void *buf);
 
 H5_DLL
 int_f
@@ -949,53 +951,53 @@ nh5tbread_field_index_c(hid_t_f *loc_id,
 H5_DLL
 int_f
 nh5tbread_field_index_int_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                            int_f *namelen,
+                            _fcd name,
+                            int_f *field_index,
+                            hsize_t_f *start,
+                            hsize_t_f *nrecords,
+                            size_t_f *type_size,
+                            void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_index_fl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *field_index,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_index_dl_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *field_index,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbread_field_index_st_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        int_f *field_index,
-                        hsize_t_f *start,
-                        hsize_t_f *nrecords,
-                        size_t_f *type_size,
-                        void *buf);
+                           int_f *namelen,
+                           _fcd name,
+                           int_f *field_index,
+                           hsize_t_f *start,
+                           hsize_t_f *nrecords,
+                           size_t_f *type_size,
+                           void *buf);
 
 H5_DLL
 int_f
 nh5tbinsert_field_c(hid_t_f *loc_id,
                     int_f *namelen,
                     _fcd name,
-			int_f *namelen1,
+                    int_f *namelen1,
                     _fcd field_name,
                     hid_t_f *field_type,
                     int_f *position,
@@ -1004,71 +1006,71 @@ nh5tbinsert_field_c(hid_t_f *loc_id,
 H5_DLL
 int_f
 nh5tbinsert_field_int_c(hid_t_f *loc_id,
-                    int_f *namelen,
-                    _fcd name,
-			int_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf);
+                        int_f *namelen,
+                        _fcd name,
+                        int_f *namelen1,
+                        _fcd field_name,
+                        hid_t_f *field_type,
+                        int_f *position,
+                        void *buf);
 H5_DLL
 int_f
 nh5tbinsert_field_fl_c(hid_t_f *loc_id,
-                    int_f *namelen,
-                    _fcd name,
-			int_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf);
+                       int_f *namelen,
+                       _fcd name,
+                       int_f *namelen1,
+                       _fcd field_name,
+                       hid_t_f *field_type,
+                       int_f *position,
+                       void *buf);
 H5_DLL
 int_f
 nh5tbinsert_field_dl_c(hid_t_f *loc_id,
-                    int_f *namelen,
-                    _fcd name,
-			int_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf);
+                       int_f *namelen,
+                       _fcd name,
+                       int_f *namelen1,
+                       _fcd field_name,
+                       hid_t_f *field_type,
+                       int_f *position,
+                       void *buf);
 H5_DLL
 int_f
 nh5tbinsert_field_st_c(hid_t_f *loc_id,
-                    int_f *namelen,
-                    _fcd name,
-			int_f *namelen1,
-                    _fcd field_name,
-                    hid_t_f *field_type,
-                    int_f *position,
-                    void *buf);
+                       int_f *namelen,
+                       _fcd name,
+                       int_f *namelen1,
+                       _fcd field_name,
+                       hid_t_f *field_type,
+                       int_f *position,
+                       void *buf);
 H5_DLL
 int_f
 nh5tbdelete_field_c(hid_t_f *loc_id,
                     int_f *namelen,
                     _fcd name,
-		int_f *namelen1,
-		_fcd field_name);
+                    int_f *namelen1,
+                    _fcd field_name);
 
 
 H5_DLL
 int_f
 nh5tbget_table_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
-                        _fcd name,
-                        hsize_t_f *nfields,
-                        hsize_t_f *nrecords);
+                      int_f *namelen,
+                      _fcd name,
+                      hsize_t_f *nfields,
+                      hsize_t_f *nrecords);
 
 H5_DLL
 int_f
 nh5tbget_field_info_c(hid_t_f *loc_id,
-                  int_f *namelen,
-                  _fcd name,
-                  hsize_t_f *nfields,
-                  size_t_f *field_sizes,
-                  size_t_f *field_offsets,
-                  size_t_f *type_size,
-		int_f *namelen2,       /* field_names lenghts */
-                  _fcd field_names) ;     /* field_names */
+                      int_f *namelen,
+                      _fcd name,
+                      hsize_t_f *nfields,
+                      size_t_f *field_sizes,
+                      size_t_f *field_offsets,
+                      size_t_f *type_size,
+                      int_f *namelen2,       /* field_names lenghts */
+                      _fcd field_names) ;     /* field_names */