[svn-r20508] Checked in changes for fixing:

Bug 1752 - H5Lite Fortran APIs do not allow you to create 4 dimensional datasets (or greater)
           * Fixed and tested the integer, real, double routines for creating and reading 
             dimensional dataset with ranks 4-7

Bug 1939 - h5tbget_field_info_f
  * Fixed error in passing an array of characters with different length
    field names for h5tbmake_table.

  * Fixed error in h5tget_field_info_f with packing the C strings
    into a fortran array of strings.

  * Added optional arguement to h5tbget_field_info_f called maxlen
    which returns the maximum string character length in a field name
    element.

  * Uncommented out test for h5tbget_field_info_f in the test program
    and added additional checks for the output.

Tested: jam (intel, gnu compilers)

1 files changed, 504 insertions, 0 deletions

diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 0985aac..484acf1 100755
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -132,6 +132,50 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
     return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
 }
 int_f
+nh5ltmake_dataset_int4_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_int5_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_int6_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_int7_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
 nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
                          int_f *namelen,
                          _fcd name,
@@ -165,6 +209,50 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
     return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
 }
 int_f
+nh5ltmake_dataset_fl4_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_fl5_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_fl6_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_fl7_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
 nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
                          int_f *namelen,
                          _fcd name,
@@ -198,6 +286,50 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
     return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
 }
 int_f
+nh5ltmake_dataset_dl4_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_dl5_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_dl6_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_dl7_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
 nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
                            int_f *namelen,
                            _fcd name,
@@ -231,6 +363,50 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
     return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
 }
 int_f
+nh5ltmake_dataset_nint4_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_nint5_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_nint6_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_nint7_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
 nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
                           int_f *namelen,
                           _fcd name,
@@ -264,6 +440,50 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
     return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
 }
 int_f
+nh5ltmake_dataset_nfl4_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_nfl5_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_nfl6_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_nfl7_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
 nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
                           int_f *namelen,
                           _fcd name,
@@ -296,6 +516,50 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
 {
     return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
 }
+int_f
+nh5ltmake_dataset_ndl4_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_ndl5_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_ndl6_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
+int_f
+nh5ltmake_dataset_ndl7_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)
+{
+    return nh5ltmake_dataset_c (loc_id, namelen, name, rank, dims, type_id, buf);
+}
 /*-------------------------------------------------------------------------
 * Function: H5LTread_dataset_c
 *
@@ -389,6 +653,46 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id,
     return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
 }
 int_f
+nh5ltread_dataset_int4_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_int5_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_int6_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_int7_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
 nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
                          int_f *namelen,
                          _fcd name,
@@ -419,6 +723,46 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
     return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
 }
 int_f
+nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
 nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
                          int_f *namelen,
                          _fcd name,
@@ -449,6 +793,46 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
     return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
 }
 int_f
+nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
+                         int_f *namelen,
+                         _fcd name,
+                         hid_t_f *type_id,
+                         void *buf,
+                         hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
 nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
                            int_f *namelen,
                            _fcd name,
@@ -479,6 +863,46 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
     return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
 }
 int_f
+nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
+                           int_f *namelen,
+                           _fcd name,
+                           hid_t_f *type_id,
+                           void *buf,
+                           hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
 nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
                           int_f *namelen,
                           _fcd name,
@@ -509,6 +933,46 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
     return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
 }
 int_f
+nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
 nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
                           int_f *namelen,
                           _fcd name,
@@ -538,6 +1002,46 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
 {
     return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
 }
+int_f
+nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
+int_f
+nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
+                          int_f *namelen,
+                          _fcd name,
+                          hid_t_f *type_id,
+                          void *buf,
+                          hsize_t_f *dims)
+{
+    return nh5ltread_dataset_c(loc_id, namelen, name, type_id, buf, dims);
+}
 /*-------------------------------------------------------------------------
 * Function: H5LTmake_dataset_string_c
 *