[svn-r26429] Merge of r26393-26428 from the trunk.

Tested w/ h5committest

50 files changed, 1329 insertions, 1408 deletions

diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in
index 7b7cf0a..efd7c04 100644
--- a/config/cmake/HDF518_Examples.cmake.in
+++ b/config/cmake/HDF518_Examples.cmake.in
@@ -110,16 +110,17 @@ set (CTEST_CONFIGURE_COMMAND
 set($ENV{LC_MESSAGES}  "en_EN")
  
 #-----------------------------------------------------------------------------
-  ## NORMAL process
-  ## --------------------------
-  CTEST_START (Experimental)
-  CTEST_CONFIGURE (BUILD "${CTEST_BINARY_DIRECTORY}")
-  CTEST_READ_CUSTOM_FILES ("${CTEST_BINARY_DIRECTORY}")
-  CTEST_BUILD (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
-  CTEST_TEST (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
-  if(res GREATER 0)
-    message (FATAL_ERROR "tests FAILED")
-  endif(res GREATER 0)
+configure_file(${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
+## NORMAL process
+## --------------------------
+ctest_start (Experimental)
+ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}")
+ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND)
+ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
+if(res GREATER 0)
+  message (FATAL_ERROR "tests FAILED")
+endif(res GREATER 0)
 #-----------------------------------------------------------------------------
 ############################################################################################################## 
 message(STATUS "DONE")
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 788e862..7b3cc2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -534,7 +534,7 @@ AC_SUBST(HL_FOR) HL_FOR=""
 AC_MSG_CHECKING([if high level library is enabled])
 AC_ARG_ENABLE([hl],
      [AS_HELP_STRING([--enable-hl],
-                     [Enable the high-level library [default=yes]])],
+                     [Enable the high level library [default=yes]])],
      [HDF5_HL=$enableval],
      [HDF5_HL=yes])
 
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 8291320..240fbc3 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -1652,7 +1652,7 @@ nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
 
     *corder = (int_f)ainfo.corder;
     *cset = (int_f)ainfo.cset;
-    *data_size = (hsize_t)ainfo.data_size;
+    *data_size = (hsize_t_f)ainfo.data_size;
 
 done:
     return ret_value;
@@ -1728,7 +1728,7 @@ nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
         *corder_valid = 1;
     *corder = (int_f)ainfo.corder;
     *cset = (int_f)ainfo.cset;
-    *data_size = (hsize_t)ainfo.data_size;
+    *data_size = (hsize_t_f)ainfo.data_size;
 
 done:
     if(c_obj_name)
@@ -1797,7 +1797,7 @@ nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
         *corder_valid = 1;
     *corder = (int_f)ainfo.corder;
     *cset = (int_f)ainfo.cset;
-    *data_size = (hsize_t)ainfo.data_size;
+    *data_size = (hsize_t_f)ainfo.data_size;
 
 done:
     if(c_obj_name)
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index ecfa946..a108384 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -621,7 +621,7 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
     hid_t c_file_space_id;
     hid_t c_xfer_prp;
     hobj_ref_t *buf_c;
-    int i, n;
+    unsigned int i, n;
 
     /*
      * Define transfer property
@@ -631,7 +631,7 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
     /*
      * Allocate temporary buffer and copy references from Fortran.
      */
-    n = (int)*dims;
+    n = (unsigned int)*dims;
     buf_c = (hobj_ref_t*)HDmalloc(sizeof(hobj_ref_t)*(n));
     if ( buf_c != NULL ) {
         for (i = 0; i < n; i++)
@@ -688,9 +688,9 @@ nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
      hid_t c_file_space_id;
      hid_t c_xfer_prp;
      hdset_reg_ref_t *buf_c = NULL;
-     int i, n;
+     unsigned int i, n;
 
-      n = (int)*dims;
+      n = (unsigned int)*dims;
      /*
       * Define transfer property
       */
@@ -1494,7 +1494,7 @@ nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
    * Reverse dimensions due to C-FORTRAN storage order.
    */
   for(i = 0; i < rank; i++)
-      c_dims[i] = dims[rank - i - 1];
+      c_dims[i] = (hsize_t)dims[rank - i - 1];
 
   status = H5Dset_extent((hid_t)*dset_id, c_dims);
 
@@ -1642,7 +1642,7 @@ nh5dwrite_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_
   hsize_t num_elem;
 
   max_len = (size_t)dims[0];
-  num_elem = dims[1];
+  num_elem = (hsize_t)dims[1];
 
   c_dset_id       = (hid_t)*dset_id;
   c_mem_type_id   = (hid_t)*mem_type_id;
@@ -1711,7 +1711,7 @@ nh5dread_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_s
   size_t max_len;
 
   hvl_t *c_buf;
-  hssize_t i;
+  hsize_t i;
   hssize_t num_elem;
 
   c_dset_id       = (hid_t)*dset_id;
@@ -1731,7 +1731,7 @@ nh5dread_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_s
    */
    status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
  if ( status < 0 ) goto DONE;
-  for (i=0; i < num_elem; i++) {
+  for (i=0; i < (hsize_t)num_elem; i++) {
        len[i] = (size_t_f)c_buf[i].len;
        memcpy(&buf[i*max_len], c_buf[i].p, c_buf[i].len*sizeof(int_f));
   }
@@ -1786,7 +1786,7 @@ nh5dwrite_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_sp
   hsize_t num_elem;
 
   max_len = (size_t)dims[0];
-  num_elem = dims[1];
+  num_elem = (hsize_t)dims[1];
 
   c_dset_id       = (hid_t)*dset_id;
   c_mem_type_id   = (hid_t)*mem_type_id;
@@ -1873,7 +1873,7 @@ nh5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spa
   hsize_t num_elem;
 
   max_len = (size_t)dims[0];
-  num_elem = dims[1];
+  num_elem = (hsize_t)dims[1];
 
   c_dset_id       = (hid_t)*dset_id;
   c_mem_type_id   = (hid_t)*mem_type_id;
@@ -1957,7 +1957,7 @@ nh5dwrite_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spa
   hsize_t num_elem;
 
   max_len = (size_t)dims[0];
-  num_elem = dims[1];
+  num_elem = (hsize_t)dims[1];
 
   c_dset_id       = (hid_t)*dset_id;
   c_mem_type_id   = (hid_t)*mem_type_id;
@@ -2026,7 +2026,7 @@ nh5dread_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spac
   size_t max_len;
 
   hvl_t *c_buf;
-  hssize_t i;
+  hsize_t i;
   hssize_t num_elem;
 
   c_dset_id       = (hid_t)*dset_id;
@@ -2046,7 +2046,7 @@ nh5dread_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spac
    */
    status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf);
  if ( status <0  )  goto DONE;
-  for (i=0; i < num_elem; i++) {
+  for (i=0; i < (hsize_t)num_elem; i++) {
        len[i] = (size_t_f)c_buf[i].len;
        memcpy(&buf[i*max_len], c_buf[i].p, c_buf[i].len*sizeof(real_f));
   }
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index 5ebb3e7..ad3ea49 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -178,7 +178,7 @@ nh5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx,
     char *c_name = NULL;
     size_t c_obj_namelen;
     char *c_obj_name = NULL;
-    hsize_t c_idx = *idx;
+    hsize_t c_idx = (hsize_t)*idx;
     hid_t gid = (-1);                 /* Temporary group ID */
     int ret_value = -1;
 
@@ -191,7 +191,7 @@ nh5gget_obj_info_idx_c(hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *idx,
     /*
      * Allocate buffer to hold name of the object
      */
-    c_obj_namelen = *obj_namelen;
+    c_obj_namelen = (size_t)*obj_namelen;
     if(c_obj_namelen)
        if(NULL == (c_obj_name = (char *)HDmalloc(c_obj_namelen + 1)))
            goto DONE;
@@ -352,6 +352,23 @@ nh5glink_c(hid_t_f *loc_id, int_f *link_type, _fcd current_name,
                 goto DONE;
             break;
 
+    /* Cases below were added to remove the warnings in gcc 4.9.2 and probably other */
+        case H5L_TYPE_EXTERNAL:
+            ret_value = -1;
+                goto DONE;
+            break;
+
+        case H5L_TYPE_MAX:
+            ret_value = -1;
+                goto DONE;
+            break;
+
+        case H5L_TYPE_ERROR:
+            ret_value = -1;
+                goto DONE;
+            break;
+    /* End of the warnings fix */
+ 
         default:        /* Unknown/unhandled link type */
             goto DONE;
     } /* end switch */
@@ -421,6 +438,22 @@ nh5glink2_c(hid_t_f *cur_loc_id, _fcd cur_name, int_f *cur_namelen,
             if(H5Lcreate_soft(c_cur_name, (hid_t)*new_loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
                 goto DONE;
             break;
+    /* Cases below were added to remove the warnings in gcc 4.9.2 and probably other */
+        case H5L_TYPE_EXTERNAL:
+            ret_value = -1;
+                goto DONE;
+            break;
+
+        case H5L_TYPE_MAX:
+            ret_value = -1;
+                goto DONE;
+            break;
+
+        case H5L_TYPE_ERROR:
+            ret_value = -1;
+                goto DONE;
+            break;
+    /* End of the warnings fix */
 
         default:        /* Unknown/unhandled link type */
             goto DONE;
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index e35de21..19fa6b1 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -153,7 +153,7 @@ h5rcreate_ptr_c (void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *r
      /*
       * Convert FORTRAN name to C name
       */
-     c_namelen = *namelen;
+     c_namelen = (size_t)*namelen;
      c_name = (char *)HD5f2cstring(name, c_namelen);
      if (c_name == NULL) return ret_value;
 
@@ -567,7 +567,7 @@ h5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_
      /*
       * Allocate buffer to hold name of an attribute
       */
-     if ((c_buf = HDmalloc(c_bufsize)) == NULL)
+     if ((c_buf = (char *)HDmalloc(c_bufsize)) == NULL)
        return ret_value;
 
      /*
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index 3fa0efc..c4b7f73 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -48,11 +48,9 @@ FILE * fort_header;
 #define FFILE "H5fortran_types.f90"
 
 /* Prototypes for the write routines */
-void writeTypedef(const char* c_type, unsigned int size);
-void writeFloatTypedef(const char* c_type, unsigned int size);
-void writeTypedefDefault(unsigned int size);
-void writeToFiles(const char* fortran_type, const char* c_type, int size, unsigned int kind);
-void writeFloatToFiles(const char* fortran_type, const char* c_type, int size, unsigned int kind);
+void writeTypedef(const char* c_typedef, const char* c_type, unsigned int size);
+void writeTypedefDefault(const char* c_typedef, unsigned int size);
+void writeToFiles(const char* c_typedef, const char* fortran_type, const char* c_type, int size, unsigned int kind);
 
 static void
 initCfile(void)
@@ -121,38 +119,23 @@ endFfile(void)
 }
 
 /* Define a c_int_x type in the C header */
-void writeTypedef(const char* c_type, unsigned int size)
+void writeTypedef(const char* c_typedef, const char* c_type, unsigned int size)
 {
-  fprintf(c_header, "#define c_int_%u %s\n", size, c_type);
-}
-
-/* Define a c_float_x type in the C header */
-void writeFloatTypedef(const char* c_type, unsigned int size)
-{
-  fprintf(c_header, "#define c_float_%u %s\n", size, c_type);
+  fprintf(c_header, "#define c_%s_%u %s\n", c_typedef, size, c_type);
 }
 
 /* Call this function if there is no matching C type for sizes > 1 */
-void writeTypedefDefault(unsigned int size)
+void writeTypedefDefault(const char* c_typedef, unsigned int size)
 {
   assert(size %2 == 0);
-
-  fprintf(c_header, "typedef struct {c_int_%u a; c_int_%u b;} c_int_%u\n", size / 2, size / 2, size);
+  fprintf(c_header, "typedef struct {c_%s_%u a; c_%s_%u b;} c_%s_%u\n", c_typedef, size / 2, c_typedef, size / 2, c_typedef, size);
 }
 
 /* Create matching Fortran and C types by writing to both files */
-void writeToFiles(const char* fortran_type, const char* c_type, int size, unsigned int kind)
-{
-  fprintf(fort_header, "        INTEGER, PARAMETER :: %s = %u\n", fortran_type, kind);
-  fprintf(c_header, "typedef c_int_%d %s;\n", size, c_type);
-}
-
-/* Create matching Fortran and C floating types by writing to both files */
-void writeFloatToFiles(const char* fortran_type, const char* c_type, int size, unsigned int kind)
+void writeToFiles(const char* c_typedef, const char* fortran_type, const char* c_type, int size, unsigned int kind)
 {
   fprintf(fort_header, "        INTEGER, PARAMETER :: %s = %u\n", fortran_type, kind);
-
-  fprintf(c_header, "typedef c_float_%d %s;\n", size, c_type);
+  fprintf(c_header, "typedef c_%s_%d %s;\n", c_typedef, size, c_type);
 }
 
 int main(void)
@@ -180,68 +163,89 @@ int main(void)
 
 #if defined H5_FORTRAN_HAS_INTEGER_1_KIND
   if(sizeof(long long) == 1)
-    writeTypedef("long long", 1);
+    writeTypedef("int", "long long", 1);
   else if(sizeof(long) == 1)
-    writeTypedef("long", 1);
+    writeTypedef("int", "long", 1);
   else if(sizeof(int) == 1)
-    writeTypedef("int", 1);
+    writeTypedef("int", "int", 1);
   else if(sizeof(short) == 1)
-    writeTypedef("short", 1);
+    writeTypedef("int", "short", 1);
   else
-    writeTypedef("char", 1);
+    writeTypedef("int", "char", 1);
   /* Actually, char is not necessarily one byte.
    * But if char isn't, then nothing is, so this
    * is as close as we can get. */
+  if(sizeof(size_t) == 1)
+    writeTypedef("size_t", "size_t", 1);
+  if(sizeof(hsize_t) == 1)
+    writeTypedef("hsize_t", "hsize_t", 1);
 #endif /*H5_FORTRAN_HAS_INTEGER_1_KIND*/
 
 #if defined H5_FORTRAN_HAS_INTEGER_2_KIND
   if(sizeof(long long) == 2)
-    writeTypedef("long long", 2);
+    writeTypedef("int", "long long", 2);
   else if(sizeof(long) == 2)
-    writeTypedef("long", 2);
+    writeTypedef("int", "long", 2);
   else if(sizeof(int) == 2)
-    writeTypedef("int", 2);
+    writeTypedef("int", "int", 2);
   else if(sizeof(short) == 2)
-    writeTypedef("short", 2);
+    writeTypedef("int", "short", 2);
   else
-    writeTypedefDefault(2);
+    writeTypedefDefault("int",2);
+
+  if(sizeof(size_t) == 2)
+    writeTypedef("size_t", "size_t", 2);
+  if(sizeof(hsize_t) == 2)
+    writeTypedef("hsize_t", "hsize_t", 2);
 #endif /*H5_FORTRAN_HAS_INTEGER_2_KIND*/
 
 #if defined H5_FORTRAN_HAS_INTEGER_4_KIND
   if(sizeof(long long) == 4)
-    writeTypedef("long long", 4);
+    writeTypedef("int", "long long", 4);
   else if(sizeof(long) == 4)
-    writeTypedef("long", 4);
+    writeTypedef("int", "long", 4);
   else if(sizeof(int) == 4)
-    writeTypedef("int", 4);
+    writeTypedef("int", "int", 4);
   else if(sizeof(short) == 4)
-    writeTypedef("short", 4);
+    writeTypedef("int", "short", 4);
   else
-    writeTypedefDefault(4);
+    writeTypedefDefault("int",4);
+
+  if(sizeof(size_t) == 4)
+    writeTypedef("size_t", "size_t", 4);
+  if(sizeof(hsize_t) == 4)
+    writeTypedef("hsize_t", "hsize_t", 4);
+    
 #endif /*H5_FORTRAN_HAS_INTEGER_4_KIND*/
 
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND
   if(sizeof(long long) == 8)
-    writeTypedef("long long", 8);
+    writeTypedef("int", "long long", 8);
   else if(sizeof(long) == 8)
-    writeTypedef("long", 8);
+    writeTypedef("int", "long", 8);
   else if(sizeof(int) == 8)
-    writeTypedef("int", 8);
+    writeTypedef("int", "int", 8);
   else if(sizeof(short) == 8)
-    writeTypedef("short", 8);
+    writeTypedef("int", "short", 8);
   else
-    writeTypedefDefault(8);
+    writeTypedefDefault("int",8);
+
+  if(sizeof(size_t) == 8)
+    writeTypedef("size_t", "size_t",  8);
+  if(sizeof(hsize_t) == 8)
+    writeTypedef("hsize_t", "hsize_t", 8);
+
 #endif /*H5_FORTRAN_HAS_INTEGER_8_KIND*/
 
   /* Define c_float_x */
 
 #if defined H5_FORTRAN_HAS_REAL_NATIVE_4_KIND || defined H5_FORTRAN_HAS_REAL_4_KIND
   if(sizeof(long double) == 4)
-    writeFloatTypedef("long double", 4);
+    writeTypedef("float", "long double", 4);
   else if(sizeof(double) == 4)
-   writeFloatTypedef("double", 4);
+   writeTypedef("float", "double", 4);
   else if(sizeof(float) == 4)
-   writeFloatTypedef("float", 4);
+   writeTypedef("float", "float", 4);
   else
    { printf("Fortran REAL is 4 bytes, no corresponding C floating type\n");
      printf("Quitting....\n");
@@ -251,11 +255,11 @@ int main(void)
 
 #if defined H5_FORTRAN_HAS_REAL_NATIVE_8_KIND || defined H5_FORTRAN_HAS_REAL_8_KIND
   if(sizeof(long double) == 8)
-    writeFloatTypedef("long double", 8);
+    writeTypedef("float", "long double", 8);
   else if(sizeof(double) == 8)
-   writeFloatTypedef("double", 8);
+   writeTypedef("float", "double", 8);
   else if(sizeof(float) == 8)
-   writeFloatTypedef("float", 8);
+   writeTypedef("float", "float", 8);
   else
    { printf("Fortran REAL is 16 bytes, no corresponding C floating type\n");
      printf("Quitting....\n");
@@ -265,11 +269,11 @@ int main(void)
 
 #if defined H5_FORTRAN_HAS_REAL_NATIVE_16_KIND || defined H5_FORTRAN_HAS_REAL_16_KIND
   if(sizeof(long double) == 16)
-    writeFloatTypedef("long double", 16);
+    writeTypedef("float", "long double", 16);
   else if(sizeof(double) == 16)
-   writeFloatTypedef("double", 16);
+   writeTypedef("float", "double", 16);
   else if(sizeof(float) == 16)
-   writeFloatTypedef("float", 16);
+   writeTypedef("float", "float", 16);
   else /*C has no 16 byte float so disable it in Fortran*/
    { printf("warning: Fortran REAL is 16 bytes, no corresponding C floating type\n");
      printf("         Disabling Fortran 16 byte REALs\n");
@@ -281,13 +285,13 @@ int main(void)
   fprintf(c_header, "\n");
   /* haddr_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HADDR_T >= 8
-  writeToFiles("HADDR_T", "haddr_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+  writeToFiles("int","HADDR_T", "haddr_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HADDR_T >= 4
-  writeToFiles("HADDR_T", "haddr_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+  writeToFiles("int","HADDR_T", "haddr_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HADDR_T >= 2
-  writeToFiles("HADDR_T", "haddr_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+  writeToFiles("int","HADDR_T", "haddr_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HADDR_T >= 1
-  writeToFiles("HADDR_T", "haddr_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+  writeToFiles("int","HADDR_T", "haddr_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
 #else
     /* Error: couldn't find a size for haddr_t */
     return -1;
@@ -295,13 +299,13 @@ int main(void)
 
   /* hsize_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HSIZE_T >= 8
-    writeToFiles("HSIZE_T", "hsize_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HSIZE_T >= 4
-    writeToFiles("HSIZE_T", "hsize_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HSIZE_T >= 2
-    writeToFiles("HSIZE_T", "hsize_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HSIZE_T >= 1
-    writeToFiles("HSIZE_T", "hsize_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+    writeToFiles("hsize_t","HSIZE_T", "hsize_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
 #else
     /* Error: couldn't find a size for hsize_t */
     return -1;
@@ -309,13 +313,13 @@ int main(void)
 
   /* hssize_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HSSIZE_T >= 8
-    writeToFiles("HSSIZE_T", "hssize_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+    writeToFiles("int","HSSIZE_T", "hssize_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HSSIZE_T >= 4
-    writeToFiles("HSSIZE_T", "hssize_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+    writeToFiles("int","HSSIZE_T", "hssize_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HSSIZE_T >= 2
-    writeToFiles("HSSIZE_T", "hssize_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+    writeToFiles("int","HSSIZE_T", "hssize_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HSSIZE_T >= 1
-    writeToFiles("HSSIZE_T", "hssize_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+    writeToFiles("int","HSSIZE_T", "hssize_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
 #else
     /* Error: couldn't find a size for hssize_t */
     return -1;
@@ -323,13 +327,13 @@ int main(void)
 
   /* off_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_OFF_T >= 8
-    writeToFiles("OFF_T", "off_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+    writeToFiles("int","OFF_T", "off_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_OFF_T >= 4
-    writeToFiles("OFF_T", "off_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+    writeToFiles("int","OFF_T", "off_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_OFF_T >= 2
-    writeToFiles("OFF_T", "off_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+    writeToFiles("int","OFF_T", "off_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_OFF_T >= 1
-    writeToFiles("OFF_T", "off_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+    writeToFiles("int","OFF_T", "off_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
 #else
     /* Error: couldn't find a size for off_t */
     return -1;
@@ -337,13 +341,13 @@ int main(void)
 
   /* size_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_SIZE_T >= 8
-    writeToFiles("SIZE_T", "size_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+    writeToFiles("size_t","SIZE_T", "size_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_SIZE_T >= 4
-    writeToFiles("SIZE_T", "size_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+    writeToFiles("size_t","SIZE_T", "size_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_SIZE_T >= 2
-    writeToFiles("SIZE_T", "size_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+    writeToFiles("size_t","SIZE_T", "size_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_SIZE_T >= 1
-    writeToFiles("SIZE_T", "size_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+    writeToFiles("size_t","SIZE_T", "size_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
 #else
     /* Error: couldn't find a size for size_t */
     return -1;
@@ -351,13 +355,13 @@ int main(void)
 
   /* int */
 #if defined H5_FORTRAN_HAS_NATIVE_8_KIND
-    writeToFiles("Fortran_INTEGER", "int_f", 8, H5_FORTRAN_HAS_NATIVE_8_KIND);
+    writeToFiles("int","Fortran_INTEGER", "int_f", 8, H5_FORTRAN_HAS_NATIVE_8_KIND);
 #elif defined H5_FORTRAN_HAS_NATIVE_4_KIND
-    writeToFiles("Fortran_INTEGER", "int_f", 4, H5_FORTRAN_HAS_NATIVE_4_KIND);
+    writeToFiles("int","Fortran_INTEGER", "int_f", 4, H5_FORTRAN_HAS_NATIVE_4_KIND);
 #elif defined H5_FORTRAN_HAS_NATIVE_2_KIND
-    writeToFiles("Fortran_INTEGER", "int_f", 2, H5_FORTRAN_HAS_NATIVE_2_KIND);
+    writeToFiles("int","Fortran_INTEGER", "int_f", 2, H5_FORTRAN_HAS_NATIVE_2_KIND);
 #elif defined H5_FORTRAN_HAS_NATIVE_1_KIND
-    writeToFiles("Fortran_INTEGER", "int_f", 1, H5_FORTRAN_HAS_NATIVE_1_KIND);
+    writeToFiles("int","Fortran_INTEGER", "int_f", 1, H5_FORTRAN_HAS_NATIVE_1_KIND);
 #else
     /* Error: couldn't find a size for int */
     return -1;
@@ -397,7 +401,7 @@ int main(void)
 	{
 	  sprintf(chrA, "Fortran_INTEGER_%d", FoundIntSize[i]);
 	  sprintf(chrB, "int_%d_f", FoundIntSize[i]);
-	  writeToFiles(chrA, chrB, FoundIntSize[i], FoundIntSizeKind[i]);
+	  writeToFiles("int",chrA, chrB, FoundIntSize[i], FoundIntSizeKind[i]);
 	}
       else  /* Did not find the integer type */
 	{
@@ -408,7 +412,7 @@ int main(void)
 		{
 		  sprintf(chrA, "Fortran_INTEGER_%d", (-1)*FoundIntSize[i]);
 		  sprintf(chrB, "int_%d_f", (-1)*FoundIntSize[i]);
-		  writeToFiles(chrA, chrB, FoundIntSize[j], FoundIntSizeKind[j]);
+		  writeToFiles("int",chrA, chrB, FoundIntSize[j], FoundIntSizeKind[j]);
 		  flag = 1;
 		  break;
 		}
@@ -421,7 +425,7 @@ int main(void)
 		    {
 		      sprintf(chrA, "Fortran_INTEGER_%d", (-1)*FoundIntSize[i]);
 		      sprintf(chrB, "int_%d_f", (-1)*FoundIntSize[i]);
-		      writeToFiles(chrA, chrB, FoundIntSize[j], FoundIntSizeKind[j]);
+		      writeToFiles("int",chrA, chrB, FoundIntSize[j], FoundIntSizeKind[j]);
 		      flag = 1;
 		      break;
 		    }
@@ -464,7 +468,7 @@ int main(void)
 	{
 	  sprintf(chrA, "Fortran_REAL_%d", FoundRealSize[i]);
 	  sprintf(chrB, "real_%d_f", FoundRealSize[i]);
-	  writeFloatToFiles(chrA, chrB, FoundRealSize[i], FoundRealSizeKind[i]);
+	  writeToFiles("float",chrA, chrB, FoundRealSize[i], FoundRealSizeKind[i]);
 	}
       else  /* Did not find the real type */
 	{
@@ -476,11 +480,11 @@ int main(void)
 		  sprintf(chrA, "Fortran_REAL_%d", (-1)*FoundRealSize[i]);
 		  sprintf(chrB, "real_%d_f", (-1)*FoundRealSize[i]);
 		  if(FoundRealSize[j]>4) {
-		    writeFloatToFiles(chrA, chrB,  FoundRealSize[j], FoundRealSizeKind[j]);
+		    writeToFiles("float",chrA, chrB,  FoundRealSize[j], FoundRealSizeKind[j]);
 		    flag = 1;
 		  }
 		/*   else { */
-/* 		    writeFloatToFiles(chrA, chrB, FoundRealSize[j]); */
+/* 		    writeToFiles("float", chrA, chrB, FoundRealSize[j]); */
 /* 		  } */
 		  flag = 1;
 		  break;
@@ -495,9 +499,9 @@ int main(void)
 		      sprintf(chrA, "Fortran_REAL_%d", (-1)*FoundRealSize[i]);
 		      sprintf(chrB, "real_%d_f", (-1)*FoundRealSize[i]);
 		      if(FoundRealSize[j]>4)
-			writeFloatToFiles(chrA, chrB,  FoundRealSize[j], FoundRealSizeKind[j]);
+			writeToFiles("float",chrA, chrB,  FoundRealSize[j], FoundRealSizeKind[j]);
 		     /*  else { */
-/* 			writeFloatToFiles(chrA, chrB, FoundRealSize[j]); */
+/* 			writeToFiles("float", chrA, chrB, FoundRealSize[j]); */
 /* 		      } */
 		      flag = 1;
 		      break;
@@ -511,15 +515,15 @@ int main(void)
 
   /* hid_t */
 #if defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HID_T >= 8
-    writeToFiles("HID_T", "hid_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+    writeToFiles("int","HID_T", "hid_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_4_KIND && H5_SIZEOF_HID_T >= 4
-    writeToFiles("HID_T", "hid_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
+    writeToFiles("int","HID_T", "hid_t_f", 4, H5_FORTRAN_HAS_INTEGER_4_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_2_KIND && H5_SIZEOF_HID_T >= 2
-    writeToFiles("HID_T", "hid_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
+    writeToFiles("int","HID_T", "hid_t_f", 2, H5_FORTRAN_HAS_INTEGER_2_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_1_KIND && H5_SIZEOF_HID_T >= 1
-    writeToFiles("HID_T", "hid_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
+    writeToFiles("int","HID_T", "hid_t_f", 1, H5_FORTRAN_HAS_INTEGER_1_KIND);
 #elif defined H5_FORTRAN_HAS_INTEGER_8_KIND && H5_SIZEOF_HID_T >= 4
-    writeToFiles("HID_T", "hid_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
+    writeToFiles("int","HID_T", "hid_t_f", 8, H5_FORTRAN_HAS_INTEGER_8_KIND);
 #else
     /* Error: couldn't find a size for hid_t */
     return -1;
@@ -528,12 +532,12 @@ int main(void)
   /* real_f */
 #if defined H5_FORTRAN_HAS_REAL_NATIVE_16_KIND
     if(H5_C_HAS_REAL_NATIVE_16 != 0) {
-      writeFloatToFiles("Fortran_REAL", "real_f", 16, H5_FORTRAN_HAS_REAL_NATIVE_16_KIND);
+      writeToFiles("float","Fortran_REAL", "real_f", 16, H5_FORTRAN_HAS_REAL_NATIVE_16_KIND);
     }
 #elif defined H5_FORTRAN_HAS_REAL_NATIVE_8_KIND
-    writeFloatToFiles("Fortran_REAL", "real_f", 8, H5_FORTRAN_HAS_REAL_NATIVE_8_KIND);
+    writeToFiles("float", "Fortran_REAL", "real_f", 8, H5_FORTRAN_HAS_REAL_NATIVE_8_KIND);
 #elif defined H5_FORTRAN_HAS_REAL_NATIVE_4_KIND
-    writeFloatToFiles("Fortran_REAL", "real_f", 4, H5_FORTRAN_HAS_REAL_NATIVE_4_KIND);
+    writeToFiles("float", "Fortran_REAL", "real_f", 4, H5_FORTRAN_HAS_REAL_NATIVE_4_KIND);
 #else
     /* Error: couldn't find a size for real_f */
     return -1;
@@ -542,13 +546,13 @@ int main(void)
   /* double_f */
 #if defined H5_FORTRAN_HAS_DOUBLE_NATIVE_16_KIND
     if(H5_C_HAS_REAL_NATIVE_16 != 0) { /* Check if C has 16 byte floats */
-      writeFloatToFiles("Fortran_DOUBLE", "double_f", 16, H5_FORTRAN_HAS_DOUBLE_NATIVE_16_KIND);
+      writeToFiles("float", "Fortran_DOUBLE", "double_f", 16, H5_FORTRAN_HAS_DOUBLE_NATIVE_16_KIND);
     } else {
 #if defined H5_FORTRAN_HAS_REAL_NATIVE_8_KIND /* Fall back to 8 byte floats */
-    writeFloatToFiles("Fortran_DOUBLE", "double_f", 8, H5_FORTRAN_HAS_REAL_NATIVE_8_KIND);
+    writeToFiles("float", "Fortran_DOUBLE", "double_f", 8, H5_FORTRAN_HAS_REAL_NATIVE_8_KIND);
     }
 #elif defined H5_FORTRAN_HAS_REAL_NATIVE_4_KIND  /* Fall back to 4 byte floats */
-    writeFloatToFiles("Fortran_DOUBLE", "double_f", 4, H5_FORTRAN_HAS_REAL_NATIVE_4_KIND);
+    writeToFiles("float", "Fortran_DOUBLE", "double_f", 4, H5_FORTRAN_HAS_REAL_NATIVE_4_KIND);
     }
 #else
     /* Error: couldn't find a size for double_f when fortran has 16 byte reals */
@@ -557,7 +561,7 @@ int main(void)
 #endif
 
 #elif defined H5_FORTRAN_HAS_DOUBLE_NATIVE_8_KIND
-    writeFloatToFiles("Fortran_DOUBLE", "double_f", 8, H5_FORTRAN_HAS_DOUBLE_NATIVE_8_KIND);
+    writeToFiles("float", "Fortran_DOUBLE", "double_f", 8, H5_FORTRAN_HAS_DOUBLE_NATIVE_8_KIND);
 #else
     /* Error: couldn't find a size for real_f */
     return -1;
diff --git a/hl/examples/ex_image1.c b/hl/examples/ex_image1.c
index 96bc7c7..18ad903 100644
--- a/hl/examples/ex_image1.c
+++ b/hl/examples/ex_image1.c
@@ -24,7 +24,6 @@ unsigned char buf [ WIDTH*HEIGHT ];
 int main( void )
 {
  hid_t         file_id;
- herr_t        status;
  hsize_t       pal_dims[] = {PAL_ENTRIES,3};
  size_t        i, j;
  int           n, space;
@@ -56,16 +55,16 @@ int main( void )
  file_id = H5Fcreate( "ex_image1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* make the image */
- status = H5IMmake_image_8bit( file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf );
+ H5IMmake_image_8bit( file_id, "image1", (hsize_t)WIDTH, (hsize_t)HEIGHT, buf );
 
  /* make a palette */
- status = H5IMmake_palette( file_id, "pallete", pal_dims, pal );
+ H5IMmake_palette( file_id, "pallete", pal_dims, pal );
 
  /* attach the palette to the image */
- status = H5IMlink_palette( file_id, "image1", "pallete" );
+ H5IMlink_palette( file_id, "image1", "pallete" );
 
  /* close the file. */
- status = H5Fclose( file_id );
+ H5Fclose( file_id );
 
  return 0;
 
diff --git a/hl/examples/ex_image2.c b/hl/examples/ex_image2.c
index 3276f7c..b57f1b7 100644
--- a/hl/examples/ex_image2.c
+++ b/hl/examples/ex_image2.c
@@ -35,7 +35,7 @@ int main( void )
  hsize_t        height;                        /* height of image */
  unsigned char  pal[ PAL_ENTRIES * 3 ];        /* palette array */
  hsize_t        pal_dims[2] = {PAL_ENTRIES,3}; /* palette dimensions */
- herr_t         status, i, n;
+ herr_t         i, n;
 
  /* create a new HDF5 file using default properties. */
  file_id = H5Fcreate( "ex_image2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
@@ -45,7 +45,7 @@ int main( void )
   goto out;
 
  /* make the image */
- status=H5IMmake_image_8bit( file_id, IMAGE1_NAME, width, height, gbuf );
+ H5IMmake_image_8bit( file_id, IMAGE1_NAME, width, height, gbuf );
  if (gbuf) {
     free(gbuf);
     gbuf = NULL;
@@ -63,10 +63,10 @@ int main( void )
  }
 
  /* make a palette */
- status=H5IMmake_palette( file_id, PAL_NAME, pal_dims, pal );
+ H5IMmake_palette( file_id, PAL_NAME, pal_dims, pal );
 
  /* attach the palette to the image */
- status=H5IMlink_palette( file_id, IMAGE1_NAME, PAL_NAME );
+ H5IMlink_palette( file_id, IMAGE1_NAME, PAL_NAME );
 
 /*-------------------------------------------------------------------------
  * True color image example with pixel interlace
@@ -78,7 +78,7 @@ int main( void )
   goto out;
 
  /* make dataset */
- status=H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
+ H5IMmake_image_24bit( file_id, IMAGE2_NAME, width, height, "INTERLACE_PIXEL", gbuf );
 
  /* close the file. */
  H5Fclose( file_id );
diff --git a/hl/examples/ex_lite1.c b/hl/examples/ex_lite1.c
index 2a82fef..446c803 100644
--- a/hl/examples/ex_lite1.c
+++ b/hl/examples/ex_lite1.c
@@ -25,16 +25,15 @@ int main( void )
  hid_t       file_id;
  hsize_t     dims[RANK]={2,3};
  int         data[6]={1,2,3,4,5,6};
- herr_t      status;
 
  /* create a HDF5 file */
  file_id = H5Fcreate ("ex_lite1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
  /* create and write an integer type dataset named "dset" */
- status = H5LTmake_dataset(file_id,"/dset",RANK,dims,H5T_NATIVE_INT,data);
+ H5LTmake_dataset(file_id,"/dset",RANK,dims,H5T_NATIVE_INT,data);
 
  /* close file */
- status = H5Fclose (file_id);
+ H5Fclose (file_id);
 
  return 0;
 }
diff --git a/hl/examples/ex_lite2.c b/hl/examples/ex_lite2.c
index 98f92c8..a696a20 100644
--- a/hl/examples/ex_lite2.c
+++ b/hl/examples/ex_lite2.c
@@ -21,17 +21,16 @@ int main( void )
  hid_t       file_id;
  int         data[6];
  hsize_t     dims[2];
- herr_t      status;
  size_t     i, j, nrow, n_values;
 
  /* open file from ex_lite1.c */
  file_id = H5Fopen ("ex_lite1.h5", H5F_ACC_RDONLY, H5P_DEFAULT);
 
  /* read dataset */
- status = H5LTread_dataset_int(file_id,"/dset",data);
+ H5LTread_dataset_int(file_id,"/dset",data);
 
  /* get the dimensions of the dataset */
- status = H5LTget_dataset_info(file_id,"/dset",dims,NULL,NULL);
+ H5LTget_dataset_info(file_id,"/dset",dims,NULL,NULL);
 
  /* print it by rows */
  n_values = (size_t)(dims[0] * dims[1]);
@@ -44,7 +43,7 @@ int main( void )
  }
 
  /* close file */
- status = H5Fclose (file_id);
+ H5Fclose (file_id);
 
  return 0;
 
diff --git a/hl/examples/ex_lite3.c b/hl/examples/ex_lite3.c
index 9164c7b..f409ea4 100644
--- a/hl/examples/ex_lite3.c
+++ b/hl/examples/ex_lite3.c
@@ -26,7 +26,6 @@ int main( void )
  hid_t   space_id;
  hsize_t dims[1] = { ATTR_SIZE };
  int     data[ATTR_SIZE] = {1,2,3,4,5};
- herr_t  status;
  int     i;
 
  /* create a file */
@@ -39,8 +38,8 @@ int main( void )
  dset_id = H5Dcreate2(file_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
  /* close */
- status = H5Dclose(dset_id);
- status = H5Sclose(space_id);
+ H5Dclose(dset_id);
+ H5Sclose(space_id);
 
 /*-------------------------------------------------------------------------
  * example of H5LTset_attribute_int
@@ -48,7 +47,7 @@ int main( void )
  */
 
  /* create and write the attribute "attr1" on the dataset "dset" */
- status = H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
+ H5LTset_attribute_int(file_id, "dset", "attr1", data, ATTR_SIZE);
 
 /*-------------------------------------------------------------------------
  * example of H5LTget_attribute_int
@@ -56,14 +55,14 @@ int main( void )
  */
 
  /* get the attribute "attr1" from the dataset "dset" */
- status = H5LTget_attribute_int(file_id, "dset", "attr1", data);
+ H5LTget_attribute_int(file_id, "dset", "attr1", data);
 
  for(i = 0; i < ATTR_SIZE; i++ )
   printf("  %d", data[i]);
  printf("\n");
 
  /* close file */
- status = H5Fclose(file_id);
+ H5Fclose(file_id);
 
  return 0;
 }
diff --git a/hl/examples/ex_table_01.c b/hl/examples/ex_table_01.c
index de304d9..1d381ae 100644
--- a/hl/examples/ex_table_01.c
+++ b/hl/examples/ex_table_01.c
@@ -80,7 +80,6 @@ int main( void )
   hsize_t    chunk_size = 10;
   int        *fill_data = NULL;
   int        compress  = 0;
-  herr_t     status;
   int        i;
 
   /* Initialize field_type */
@@ -100,7 +99,7 @@ int main( void )
  *-------------------------------------------------------------------------
  */
 
- status=H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
@@ -109,7 +108,7 @@ int main( void )
  *-------------------------------------------------------------------------
  */
 
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* print it by rows */
  for (i=0; i<NRECORDS; i++) {
diff --git a/hl/examples/ex_table_02.c b/hl/examples/ex_table_02.c
index 98e33d3..129f87d 100644
--- a/hl/examples/ex_table_02.c
+++ b/hl/examples/ex_table_02.c
@@ -78,7 +78,6 @@ int main( void )
  hsize_t    chunk_size = 10;
  int        *fill_data = NULL;
  int        compress  = 0;
- herr_t     status;
  int        i;
 
   /* Append particles */
@@ -99,16 +98,16 @@ int main( void )
  file_id = H5Fcreate( "ex_table_02.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* make a table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
                         dst_size, field_names, dst_offset, field_type,
                         chunk_size, fill_data, compress, p_data  );
 
  /* append two records */
- status=H5TBappend_records(file_id, TABLE_NAME,NRECORDS_ADD, dst_size, dst_offset, dst_sizes,
+ H5TBappend_records(file_id, TABLE_NAME,NRECORDS_ADD, dst_size, dst_offset, dst_sizes,
   &particle_in );
 
  /* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* print it by rows */
  for (i=0; i<NRECORDS+NRECORDS_ADD; i++) {
diff --git a/hl/examples/ex_table_03.c b/hl/examples/ex_table_03.c
index 7315fd3..c9f94ce 100644
--- a/hl/examples/ex_table_03.c
+++ b/hl/examples/ex_table_03.c
@@ -71,7 +71,6 @@ int main( void )
  hsize_t    chunk_size = 10;
  hsize_t    start;      /* Record to start reading/writing */
  hsize_t    nrecords;   /* Number of records to read/write */
- herr_t     status;
  int        i;
 
  /* Define 2 new particles to write */
@@ -92,7 +91,7 @@ int main( void )
  file_id = H5Fcreate( "ex_table_03.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make the table */
- status=H5TBmake_table( "Table Title",
+ H5TBmake_table( "Table Title",
   file_id,
   TABLE_NAME,
   NFIELDS,
@@ -110,11 +109,11 @@ int main( void )
  /* Overwrite 2 records starting at record 0 */
  start    = 0;
  nrecords = NRECORDS_WRITE;
- status=H5TBwrite_records( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
+ H5TBwrite_records( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
   dst_sizes, particle_in);
 
  /* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* print it by rows */
  for (i=0; i<NRECORDS; i++) {
diff --git a/hl/examples/ex_table_04.c b/hl/examples/ex_table_04.c
index 0a01116..01f2869 100644
--- a/hl/examples/ex_table_04.c
+++ b/hl/examples/ex_table_04.c
@@ -81,7 +81,6 @@ int main( void )
  hsize_t    start;                       /* Record to start reading/writing */
  hsize_t    nrecords;                    /* Number of records to read/write */
  int        compress  = 0;
- herr_t     status;
  int        i;
  Particle  *p_data = NULL;               /* Initially no data */
  float      pressure_in [NRECORDS_ADD] = /* Define new values for the field "Pressure"  */
@@ -118,24 +117,24 @@ int main( void )
  file_id = H5Fcreate( "ex_table_04.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
  /* Write the pressure field starting at record 2 */
  start    = 2;
  nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_name( file_id, TABLE_NAME, "Pressure", start, nrecords,
+ H5TBwrite_fields_name( file_id, TABLE_NAME, "Pressure", start, nrecords,
    sizeof( float ), 0, field_sizes_pre, pressure_in  );
 
  /* Write the new longitude and latitude information starting at record 2 */
  start    = 2;
  nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_name( file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords,
+ H5TBwrite_fields_name( file_id, TABLE_NAME, "Latitude,Longitude", start, nrecords,
    sizeof( Position ), field_offset_pos, field_sizes_pos,  position_in  );
 
  /* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* print it by rows */
  for (i=0; i<NRECORDS; i++) {
diff --git a/hl/examples/ex_table_05.c b/hl/examples/ex_table_05.c
index f0c96eb..7ed1fec 100644
--- a/hl/examples/ex_table_05.c
+++ b/hl/examples/ex_table_05.c
@@ -51,13 +51,6 @@ int main( void )
   int    longi;
  } Position;
 
- /* Define a subset of Particle, with name and pressure fields */
- typedef struct NamePressure
- {
-  char   name[16];
-  float  pressure;
- } NamePressure;
-
  /* Calculate the type_size and the offsets of our struct members */
  Particle  dst_buf[NRECORDS];
  size_t dst_size =  sizeof( Particle );
@@ -91,7 +84,6 @@ int main( void )
  hsize_t    nfields;
  hsize_t    start;                       /* Record to start reading/writing */
  hsize_t    nrecords;                    /* Number of records to read/write */
- herr_t     status;
  int        i;
 
  /* Define new values for the field "Pressure"  */
@@ -129,7 +121,7 @@ int main( void )
  file_id = H5Fcreate( "ex_table_05.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make the table */
- status=H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title", file_id, TABLE_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
@@ -137,7 +129,7 @@ int main( void )
  nfields  = 1;
  start    = 2;
  nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords,
+ H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pre, start, nrecords,
    sizeof( float ), 0, field_sizes_pre, pressure_in  );
 
 
@@ -145,12 +137,12 @@ int main( void )
  nfields  = 2;
  start    = 2;
  nrecords = NRECORDS_ADD;
- status=H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords,
+ H5TBwrite_fields_index( file_id, TABLE_NAME, nfields, field_index_pos, start, nrecords,
    sizeof( Position ), field_offset_pos, field_sizes_pos, position_in  );
 
 
  /* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* print it by rows */
  for (i=0; i<NRECORDS; i++) {
@@ -163,8 +155,7 @@ int main( void )
   printf ("\n");
  }
 
-
-  /* close type */
+ /* close type */
  H5Tclose( string_type );
 
  /* close the file */
diff --git a/hl/examples/ex_table_06.c b/hl/examples/ex_table_06.c
index 261b23c..081347e 100644
--- a/hl/examples/ex_table_06.c
+++ b/hl/examples/ex_table_06.c
@@ -60,7 +60,6 @@ int main( void )
   int        compress  = 0;
   hsize_t    nfields_out;
   hsize_t    nrecords_out;
-  herr_t     status;
 
   /* Initialize field_type */
   string_type = H5Tcopy( H5T_C_S1 );
@@ -75,12 +74,12 @@ int main( void )
  file_id = H5Fcreate( "ex_table_06.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make a table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,dst_size,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,dst_size,
                        field_names, dst_offset, field_type,
                        chunk_size, fill_data, compress, NULL);
 
  /* Get table info  */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_07.c b/hl/examples/ex_table_07.c
index 3479aa8..3be788f 100644
--- a/hl/examples/ex_table_07.c
+++ b/hl/examples/ex_table_07.c
@@ -73,7 +73,6 @@ int main( void )
  hsize_t    nrecords;                   /* Number of records to insert/delete */
  hsize_t    nfields_out;
  hsize_t    nrecords_out;
- herr_t     status;
 
  /* Initialize the field field_type */
  string_type = H5Tcopy( H5T_C_S1 );
@@ -88,17 +87,17 @@ int main( void )
  file_id = H5Fcreate( "ex_table_07.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
   dst_size,field_names, dst_offset, field_type,
   chunk_size, fill_data, compress, p_data  );
 
  /* Delete records  */
  start    = 3;
  nrecords = 3;
- status=H5TBdelete_record( file_id, TABLE_NAME, start, nrecords );
+ H5TBdelete_record( file_id, TABLE_NAME, start, nrecords );
 
   /* Get table info  */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_08.c b/hl/examples/ex_table_08.c
index bd3a3e1..5d3659f 100644
--- a/hl/examples/ex_table_08.c
+++ b/hl/examples/ex_table_08.c
@@ -84,7 +84,6 @@ int main( void )
  int        *fill_data = NULL;
  hsize_t    start;      /* Record to start reading */
  hsize_t    nrecords;   /* Number of records to insert/delete */
- herr_t     status;
  hsize_t    nfields_out;
  hsize_t    nrecords_out;
  int        i;
@@ -102,21 +101,21 @@ int main( void )
  file_id = H5Fcreate( "ex_table_08.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
  /* Insert records */
  start    = 3;
  nrecords = NRECORDS_INS;
- status=H5TBinsert_record( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
+ H5TBinsert_record( file_id, TABLE_NAME, start, nrecords, dst_size, dst_offset,
   dst_sizes, p_data_insert );
 
  /* read the table */
- status=H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* get table info  */
- status=H5TBget_table_info(file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info(file_id,TABLE_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_09.c b/hl/examples/ex_table_09.c
index c50e20d..a4ef611 100644
--- a/hl/examples/ex_table_09.c
+++ b/hl/examples/ex_table_09.c
@@ -81,7 +81,6 @@ int main( void )
  hsize_t    start1;                      /* Record to start reading from 1st table */
  hsize_t    nrecords;                    /* Number of records to insert */
  hsize_t    start2;                      /* Record to start writing in 2nd table */
- herr_t     status;
  int        i;
  hsize_t    nfields_out;
  hsize_t    nrecords_out;
@@ -99,11 +98,11 @@ int main( void )
  file_id = H5Fcreate( "ex_table_09.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make 2 tables: TABLE2_NAME is empty  */
- status=H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
- status=H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, NULL  );
 
@@ -112,13 +111,13 @@ int main( void )
  start1    = 3;
  nrecords  = NRECORDS_INS;
  start2    = 6;
- status=H5TBadd_records_from( file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2 );
+ H5TBadd_records_from( file_id, TABLE1_NAME, start1, nrecords, TABLE2_NAME, start2 );
 
  /* read TABLE2_NAME: it should have 2 more records now */
- status=H5TBread_table( file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE2_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* Get table info  */
- status=H5TBget_table_info (file_id,TABLE2_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE2_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_10.c b/hl/examples/ex_table_10.c
index 73a9431..059c7ea 100644
--- a/hl/examples/ex_table_10.c
+++ b/hl/examples/ex_table_10.c
@@ -77,7 +77,6 @@ int main( void )
  hsize_t    chunk_size = 10;
  int        compress  = 0;
  int        *fill_data = NULL;
- herr_t     status;
  hsize_t    nfields_out;
  hsize_t    nrecords_out;
  int        i;
@@ -95,22 +94,22 @@ int main( void )
  file_id = H5Fcreate( "ex_table_10.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make two tables */
- status=H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE1_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
- status=H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE2_NAME,NFIELDS,NRECORDS,
                          dst_size,field_names, dst_offset, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
  /* Combine the two tables into a third in the same file  */
- status=H5TBcombine_tables( file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME );
+ H5TBcombine_tables( file_id, TABLE1_NAME, file_id, TABLE2_NAME, TABLE3_NAME );
 
  /* read the combined table */
- status=H5TBread_table( file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
+ H5TBread_table( file_id, TABLE3_NAME, dst_size, dst_offset, dst_sizes, dst_buf );
 
  /* Get table info  */
- status=H5TBget_table_info (file_id,TABLE3_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE3_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_11.c b/hl/examples/ex_table_11.c
index 6746945..687568c 100644
--- a/hl/examples/ex_table_11.c
+++ b/hl/examples/ex_table_11.c
@@ -67,10 +67,9 @@ int main( void )
  hid_t      file_id;
  hsize_t    chunk_size = 10;
  int        compress  = 0;
- Particle1  fill_data[1] = { "no data",-1,-1, -99.0f, -99.0 };
+ Particle1  fill_data[1] = { {"no data",-1,-1, -99.0f, -99.0} };
  int        fill_data_new[1] = { -100 };
  hsize_t    position;
- herr_t     status;
  hsize_t    nfields_out;
  hsize_t    nrecords_out;
 
@@ -91,17 +90,17 @@ int main( void )
  file_id = H5Fcreate( "ex_table_11.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make the table */
- status=H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
+ H5TBmake_table( "Table Title",file_id,TABLE_NAME,NFIELDS,NRECORDS,
                          dst_size1,field_names, dst_offset1, field_type,
                          chunk_size, fill_data, compress, p_data  );
 
  /* Insert the new field at the end of the field list */
  position = NFIELDS;
- status=H5TBinsert_field( file_id, TABLE_NAME, "New Field", field_type_new, position,
+ H5TBinsert_field( file_id, TABLE_NAME, "New Field", field_type_new, position,
   fill_data_new, data );
 
  /* Get table info  */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/examples/ex_table_12.c b/hl/examples/ex_table_12.c
index b6cc2b4..125b8be 100644
--- a/hl/examples/ex_table_12.c
+++ b/hl/examples/ex_table_12.c
@@ -70,7 +70,6 @@ int main( void )
  int        compress  = 0;
  Particle   fill_data[1] =
  { {"no data",-1,-1, -99.0f, -99.0} };
- herr_t     status;
  hsize_t    nfields_out;
  hsize_t    nrecords_out;
 
@@ -87,15 +86,15 @@ int main( void )
  file_id = H5Fcreate( "ex_table_12.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
 
  /* Make a table */
- status=H5TBmake_table( "Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size,
+ H5TBmake_table( "Table Title", file_id, TABLE_NAME, NFIELDS, NRECORDS, dst_size,
   field_names, dst_offset, field_type,
   chunk_size, fill_data, compress, p_data  );
 
  /* Delete the field */
- status=H5TBdelete_field( file_id, TABLE_NAME, "Pressure" );
+ H5TBdelete_field( file_id, TABLE_NAME, "Pressure" );
 
  /* Get table info  */
- status=H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
+ H5TBget_table_info (file_id,TABLE_NAME, &nfields_out, &nrecords_out );
 
  /* print */
  printf ("Table has %d fields and %d records\n",(int)nfields_out,(int)nrecords_out);
diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c
index 2e38939..1de3fff 100644
--- a/hl/fortran/src/H5DSfc.c
+++ b/hl/fortran/src/H5DSfc.c
@@ -35,7 +35,7 @@
 *-------------------------------------------------------------------------
 */
 int_f
-nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, int_f *dimnamelen) 
+nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen) 
 {
   char *c_dimname = NULL;
   int_f ret_value = 0;
@@ -217,7 +217,7 @@ nh5dsis_scale_c( hid_t_f *did, int_f *is_scale)
 *-------------------------------------------------------------------------
 */
 int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, int_f *labellen) 
+nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen) 
 {
   char *c_label = NULL;
   int_f ret_value = 0;
@@ -269,14 +269,14 @@ nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
   /*
    * Allocate buffer to hold label
    */
-  if ((c_label = HDmalloc((size_t)*size + 1)) == NULL)
+  if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
     HGOTO_DONE(FAIL);
 
   /*
    * call H5DSget_label function.
    */
       
-  if( (size_c = (size_t_f)H5DSget_label( (hid_t)*did, (unsigned)*idx, c_label, (size_t)*size+1)) < 0)
+  if( (size_c = H5DSget_label( (hid_t)*did, (unsigned)*idx, c_label, (size_t)*size+1)) < 0)
     HGOTO_DONE(FAIL)
 
   /*
@@ -287,7 +287,7 @@ nh5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
 
 done:
      *size = (size_t_f)size_c; /* Don't subtract '1'  because H5DSget_label doesn't include the 
-				* trailing NULL in the length calculation, Ref. HDFFV-7596 */
+                                * trailing NULL in the length calculation, Ref. HDFFV-7596 */
      if(c_label) HDfree(c_label);
      return ret_value;
 
@@ -318,14 +318,14 @@ nh5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
   /*
    * Allocate buffer to hold name
    */
-  if ((c_scale_name = HDmalloc((size_t)*size + 1)) == NULL)
+  if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
     HGOTO_DONE(FAIL);
 
   /*
    * call H5DSget_scale_name function.
    */
       
-  if( (size_c = (size_t_f)H5DSget_scale_name( (hid_t)*did, c_scale_name, (size_t)*size+1)) < 0)
+  if( (size_c = H5DSget_scale_name( (hid_t)*did, c_scale_name, (size_t)*size+1)) < 0)
     HGOTO_DONE(FAIL)
 
   /*
diff --git a/hl/fortran/src/H5DSff.f90 b/hl/fortran/src/H5DSff.f90
index 8cb568e..04540a6 100644
--- a/hl/fortran/src/H5DSff.f90
+++ b/hl/fortran/src/H5DSff.f90
@@ -57,7 +57,7 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(in), OPTIONAL :: dimname  ! The dimension name
     INTEGER :: errcode                                 ! Error code
 
-    INTEGER:: dimname_len                              ! length of dimname (if present)
+    INTEGER(SIZE_T) :: dimname_len                     ! length of dimname (if present)
 
     INTERFACE
        INTEGER FUNCTION H5DSset_scale_c(dsid, dimname, dimname_len )
@@ -70,7 +70,7 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dimname  
          INTEGER(hid_t),   INTENT(in) :: dsid     ! The dataset to be made a Dimension Scale
          CHARACTER(LEN=*), INTENT(in) :: dimname  ! The dimension name
-         INTEGER, INTENT(in) :: dimname_len
+         INTEGER(SIZE_T),  INTENT(in) :: dimname_len
        END FUNCTION H5DSset_scale_c
     END INTERFACE
 
@@ -78,7 +78,7 @@ CONTAINS
        dimname_len = LEN(dimname)
        errcode = H5DSset_scale_c(dsid, dimname, dimname_len )
     ELSE
-       errcode = H5DSset_scale_c(dsid, " ", 0 )
+       errcode = H5DSset_scale_c(dsid, " ", INT(0,SIZE_T) )
     ENDIF
 
   END SUBROUTINE H5DSset_scale_f
@@ -348,7 +348,7 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(in) :: label  ! The label
     INTEGER :: errcode                     ! Error code
 
-    INTEGER :: label_len  ! Length of label
+    INTEGER(SIZE_T) :: label_len  ! Length of label
     INTEGER :: c_idx
 
     INTERFACE
@@ -363,7 +363,7 @@ CONTAINS
          INTEGER(hid_t),   INTENT(in) :: did        ! The dataset
          INTEGER       ,   INTENT(in) :: idx        ! The dimension
          CHARACTER(LEN=*), INTENT(in) :: label      ! The label
-         INTEGER,          INTENT(in) :: label_len  ! Length of label
+         INTEGER(SIZE_T),  INTENT(in) :: label_len  ! Length of label
        END FUNCTION H5DSset_label_c
     END INTERFACE
 
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index b4ea067..ae58fab 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -470,7 +470,7 @@ herr_t H5IM_get_palette(hid_t loc_id,
  hid_t      attr_space_id;
  hid_t      attr_class;
  hssize_t   n_refs;
- hsize_t    dim_ref;
+ size_t    dim_ref;
  hobj_ref_t *refbuf;     /* buffer to read references */
  hid_t      pal_id;
 
@@ -503,9 +503,9 @@ herr_t H5IM_get_palette(hid_t loc_id,
 
    n_refs = H5Sget_simple_extent_npoints(attr_space_id);
 
-   dim_ref = n_refs;
+   dim_ref = (size_t)n_refs;
 
-   refbuf = HDmalloc(sizeof(hobj_ref_t) * (int)dim_ref);
+   refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
 
    if(H5Aread(attr_id, attr_type, refbuf) < 0)
     goto out;
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index 39cb990..6acd410 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -40,7 +40,7 @@
 
 int_f
 nh5immake_image_8bit_c (hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         hsize_t_f *width,
                         hsize_t_f *height,
@@ -50,15 +50,13 @@ nh5immake_image_8bit_c (hid_t_f *loc_id,
     herr_t  ret;
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
     hsize_t w = (hsize_t)*width;
     hsize_t h = (hsize_t)*height;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -103,30 +101,25 @@ done:
 
 int_f
 nh5imread_image_c (hid_t_f *loc_id,
-                   int_f *namelen,
+                   size_t_f *namelen,
                    _fcd name,
                    int_f *buf)
 {
     int     ret_value = -1;
     herr_t  ret;
-    hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
     * call H5IMread_image function.
     */
-    c_loc_id = (hid_t)*loc_id;
-
-    ret = H5IMread_imagef(c_loc_id,c_name,buf);
+    ret = H5IMread_imagef((hid_t)*loc_id,c_name,buf);
 
     if (ret < 0)
         goto done;
@@ -161,9 +154,9 @@ done:
 
 int_f
 nh5immake_image_24bit_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
-                         int_f *ilen,
+                         size_t_f *ilen,
                          _fcd il,
                          hsize_t_f *width,
                          hsize_t_f *height,
@@ -173,22 +166,18 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
     herr_t  ret;
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
     char    *c_il = NULL;
-    int     c_ilen;
     hsize_t w = (hsize_t)*width;
     hsize_t h = (hsize_t)*height;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_ilen = *ilen;
-    c_il = (char *)HD5f2cstring(il, c_ilen);
+    c_il = (char *)HD5f2cstring(il, (size_t)*ilen);
     if (c_il == NULL)
         goto done;
 
@@ -197,7 +186,7 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,buf);
+    ret = H5IMmake_image_24bitf(c_loc_id,c_name,w,h,c_il,(int_f *)buf);
 
     if (ret < 0)
         goto done;
@@ -234,20 +223,19 @@ done:
 
 int_f
 nh5imget_image_info_c(hid_t_f *loc_id,
-                      int_f *namelen,
+                      size_t_f *namelen,
                       _fcd name,
                       hsize_t_f *width,
                       hsize_t_f *height,
                       hsize_t_f *planes,
                       hsize_t_f *npals,
-                      int_f *ilen,
+                      size_t_f *ilen,
                       _fcd interlace)
 {
     int          ret_value = -1;
     herr_t       ret;
     hid_t        c_loc_id;
     char         *c_name = NULL;
-    int          c_namelen;
     hsize_t      c_width;
     hsize_t      c_height;
     hsize_t      c_planes;
@@ -257,15 +245,14 @@ nh5imget_image_info_c(hid_t_f *loc_id,
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
     /*
     * allocate buffer to hold name of an attribute
     */
-    if ((c_buf = HDmalloc((size_t)*ilen +1)) == NULL)
+    if ((c_buf = (char *)HDmalloc((size_t)*ilen +1)) == NULL)
         goto done;
 
     /*
@@ -321,19 +308,17 @@ done:
 
 int_f
 nh5imis_image_c(hid_t_f *loc_id,
-                int_f *namelen,
+                size_t_f *namelen,
                 _fcd name)
 {
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
     herr_t  ret;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL) return -1;
 
     /*
@@ -372,7 +357,7 @@ nh5imis_image_c(hid_t_f *loc_id,
 
 int_f
 nh5immake_palette_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      hsize_t_f *dims,
                      void *buf)
@@ -386,16 +371,16 @@ nh5immake_palette_c (hid_t_f *loc_id,
     /*
     * convert FORTRAN name to C name
     */
-    if(NULL == (c_name = (char *)HD5f2cstring(name, (int)*namelen)))
+    if(NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
     for(i = 0; i < rank ; i++)
-        c_dims[i] =  dims[i];
+      c_dims[i] =  (hsize_t)dims[i];
 
     /*
     * call H5IMmake_palette function.
     */
-    if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, buf) < 0)
+    if(H5IMmake_palettef((hid_t)*loc_id, c_name, c_dims, (int_f *)buf) < 0)
         HGOTO_DONE(FAIL)
 
 done:
@@ -427,9 +412,9 @@ done:
 
 int_f
 nh5imlink_palette_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
-                     int_f *ilen,
+                     size_t_f *ilen,
                      _fcd pal_name)
 {
     int     ret_value = -1;
@@ -437,19 +422,15 @@ nh5imlink_palette_c (hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_namepal = NULL;
-    int     c_namelen;
-    int     c_namelenpal;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_namelenpal = *ilen;
-    c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal);
+    c_namepal = (char *)HD5f2cstring(pal_name, (size_t)*ilen);
     if (c_namepal == NULL)
         goto done;
 
@@ -496,9 +477,9 @@ done:
 
 int_f
 nh5imunlink_palette_c (hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *ilen,
+                       size_t_f *ilen,
                        _fcd pal_name)
 {
     int     ret_value = -1;
@@ -506,20 +487,15 @@ nh5imunlink_palette_c (hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_namepal = NULL;
-    int     c_namelen;
-    int     c_namelenpal;
-
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_namelenpal = *ilen;
-    c_namepal = (char *)HD5f2cstring(pal_name, c_namelenpal);
+    c_namepal = (char *)HD5f2cstring(pal_name, (size_t)*ilen);
     if (c_namepal == NULL)
         goto done;
 
@@ -567,7 +543,7 @@ done:
 
 int_f
 nh5imget_npalettes_c(hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      hsize_t_f *npals)
 {
@@ -575,14 +551,12 @@ nh5imget_npalettes_c(hid_t_f *loc_id,
     herr_t       ret;
     hid_t        c_loc_id;
     char         *c_name = NULL;
-    int          c_namelen;
     hssize_t     c_npals;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -631,7 +605,7 @@ done:
 
 int_f
 nh5imget_palette_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         int_f *pal_number,
                         hsize_t_f *dims)
@@ -640,15 +614,13 @@ nh5imget_palette_info_c(hid_t_f *loc_id,
     herr_t       ret;
     hid_t        c_loc_id;
     char         *c_name = NULL;
-    int          c_namelen;
     hsize_t      c_dims[2];
     int          i;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -700,7 +672,7 @@ done:
 
 int_f
 nh5imget_palette_c(hid_t_f *loc_id,
-                   int_f *namelen,
+                   size_t_f *namelen,
                    _fcd name,
                    int_f *pal_number,
                    void *buf)
@@ -709,13 +681,11 @@ nh5imget_palette_c(hid_t_f *loc_id,
     herr_t       ret;
     hid_t        c_loc_id;
     char         *c_name = NULL;
-    int          c_namelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
          goto done;
 
@@ -724,7 +694,7 @@ nh5imget_palette_c(hid_t_f *loc_id,
     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,buf);
+    ret = H5IMget_palettef(c_loc_id,c_name,*pal_number,(int_f *)buf);
 
     if (ret < 0)
          goto done;
@@ -760,19 +730,17 @@ done:
 
 int_f
 nh5imis_palette_c(hid_t_f *loc_id,
-                  int_f *namelen,
+                  size_t_f *namelen,
                   _fcd name)
 {
     hid_t   c_loc_id;
     char    *c_name;
-    int     c_namelen;
     herr_t  ret;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL) return -1;
 
     /*
diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90
index 37030ac..50c6d8b 100644
--- a/hl/fortran/src/H5IMff.f90
+++ b/hl/fortran/src/H5IMff.f90
@@ -62,7 +62,7 @@ subroutine h5immake_image_8bit_f(loc_id,&
  integer(hsize_t), intent(in) :: height             ! height of image
  integer, intent(in), dimension(*) :: buf           ! buffer
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
+ INTEGER(size_t) :: namelen                         ! name length
 
  interface
   integer function h5immake_image_8bit_c(loc_id,namelen,dset_name,width,height,buf)
@@ -73,11 +73,11 @@ subroutine h5immake_image_8bit_f(loc_id,&
   !DEC$ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer :: namelen                                      ! lenght of name buffer
+  integer(size_t) :: namelen                              ! length of name buffer
   character(len=*), intent(in) :: dset_name               ! name of the dataset
   integer(hsize_t), intent(in) :: width                   ! width of image
   integer(hsize_t), intent(in) :: height                  ! height of image
-  integer , intent(in), dimension(*) :: buf               ! buffer
+  integer         , intent(in), dimension(*) :: buf       ! buffer
   end function h5immake_image_8bit_c
  end interface
 
@@ -123,7 +123,7 @@ subroutine h5imread_image_f(loc_id,&
  character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer, intent(inout), dimension(*) :: buf        ! buffer
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
+ INTEGER(size_t) :: namelen                         ! name length
 
  interface
   integer function h5imread_image_c(loc_id,namelen,dset_name,buf)
@@ -134,7 +134,7 @@ subroutine h5imread_image_f(loc_id,&
   !DEC$ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer :: namelen                                      ! lenght of name buffer
+  integer(size_t) :: namelen                              ! length of name buffer
   character(len=*), intent(in) :: dset_name               ! name of the dataset
   integer, intent(inout), dimension(*) :: buf             ! buffer
   end function h5imread_image_c
@@ -187,8 +187,8 @@ subroutine h5immake_image_24bit_f(loc_id,&
  character(len=*), intent(in) :: il                 ! interlace
  integer, intent(in), dimension(*) :: buf           ! buffer
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
- integer :: ilen                                    ! name length
+ INTEGER(size_t) :: namelen                                 ! name length
+ integer(size_t) :: ilen                                    ! name length
 
  interface
   integer function h5immake_image_24bit_c(loc_id,namelen,dset_name,ilen,il,width,height,buf)
@@ -205,8 +205,8 @@ subroutine h5immake_image_24bit_f(loc_id,&
   integer(hsize_t), intent(in) :: height                  ! height of image
   character(len=*), intent(in) :: il                      ! interlace
   integer, intent(in), dimension(*) :: buf                ! buffer
-  integer :: namelen                                      ! lenght of name buffer
-  integer :: ilen                                         ! name length
+  integer(size_t) :: namelen                                      ! length of name buffer
+  integer(size_t) :: ilen                                         ! name length
 
   end function h5immake_image_24bit_c
  end interface
@@ -262,8 +262,8 @@ subroutine h5imget_image_info_f(loc_id,&
  integer(hsize_t), intent(inout) :: npals           ! palettes
  character(len=*), intent(inout) :: interlace       ! interlace
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
- integer :: ilen                                    ! name length
+ integer(size_t) :: namelen                                 ! name length
+ integer(size_t) :: ilen                                    ! name length
 
  interface
   integer function h5imget_image_info_c(loc_id,namelen,dset_name,width,height,planes,npals,ilen,interlace)
@@ -281,8 +281,8 @@ subroutine h5imget_image_info_f(loc_id,&
   integer(hsize_t), intent(inout) :: planes          ! color planes
   integer(hsize_t), intent(inout) :: npals           ! palettes
   character(len=*), intent(inout) :: interlace       ! interlace
-  integer :: namelen                                 ! name length
-  integer :: ilen                                    ! name length
+  integer(size_t) :: namelen                                 ! name length
+  integer(size_t) :: ilen                                    ! name length
   end function h5imget_image_info_c
  end interface
 
@@ -325,7 +325,7 @@ integer function h5imis_image_f(loc_id,&
  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
  character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
+ integer(size_t) :: namelen                                 ! name length
 
  interface
   integer function h5imis_image_c(loc_id,namelen,dset_name)
@@ -336,7 +336,7 @@ integer function h5imis_image_f(loc_id,&
   !DEC$ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer :: namelen                                      ! lenght of name buffer
+  integer(size_t) :: namelen                                      ! length of name buffer
   character(len=*), intent(in) :: dset_name               ! name of the dataset
   end function h5imis_image_c
  end interface
@@ -385,7 +385,7 @@ subroutine h5immake_palette_f(loc_id,&
  integer(hsize_t), intent(in), dimension(*) :: pal_dims ! dimensions
  integer, intent(in), dimension(*) :: buf               ! buffer
  integer :: errcode                                     ! error code
- integer :: namelen                                     ! name length
+ integer(size_t) :: namelen                                     ! name length
 
  interface
   integer function h5immake_palette_c(loc_id,namelen,dset_name,pal_dims,buf)
@@ -396,7 +396,7 @@ subroutine h5immake_palette_f(loc_id,&
   !DEC$ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer :: namelen                                      ! lenght of name buffer
+  integer(size_t) :: namelen                                      ! length of name buffer
   character(len=*), intent(in) :: dset_name               ! name of the dataset
   integer(hsize_t), intent(in), dimension(*) :: pal_dims  ! dimensions
   integer, intent(in), dimension(*) :: buf                ! buffer
@@ -444,8 +444,8 @@ subroutine h5imlink_palette_f(loc_id,&
  character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: pal_name           ! palette name
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
- integer :: ilen                                    ! name length
+ integer(size_t) :: namelen                                 ! name length
+ integer(size_t) :: ilen                                    ! name length
 
  interface
   integer function h5imlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
@@ -459,8 +459,8 @@ subroutine h5imlink_palette_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
   character(len=*), intent(in) :: dset_name          ! name of the dataset
   character(len=*), intent(in) :: pal_name           ! palette name
-  integer :: namelen                                 ! name length
-  integer :: ilen                                    ! name length
+  integer(size_t) :: namelen                                 ! name length
+  integer(size_t) :: ilen                                    ! name length
   end function h5imlink_palette_c
  end interface
 
@@ -507,8 +507,8 @@ subroutine h5imunlink_palette_f(loc_id,&
  character(len=*), intent(in) :: dset_name          ! name of the dataset
  character(len=*), intent(in) :: pal_name           ! palette name
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
- integer :: ilen                                    ! name length
+ integer(size_t) :: namelen                                 ! name length
+ integer(size_t) :: ilen                                    ! name length
 
  interface
   integer function h5imunlink_palette_c(loc_id,namelen,dset_name,ilen,pal_name)
@@ -522,8 +522,8 @@ subroutine h5imunlink_palette_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
   character(len=*), intent(in) :: dset_name          ! name of the dataset
   character(len=*), intent(in) :: pal_name           ! palette name
-  integer :: namelen                                 ! name length
-  integer :: ilen                                    ! name length
+  integer(size_t) :: namelen                                 ! name length
+  integer(size_t) :: ilen                                    ! name length
   end function h5imunlink_palette_c
  end interface
 
@@ -570,7 +570,7 @@ subroutine h5imget_npalettes_f(loc_id,&
  character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer(hsize_t), intent(inout) :: npals           ! palettes
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
+ integer(size_t) :: namelen                                 ! name length
 
  interface
   integer function h5imget_npalettes_c(loc_id,namelen,dset_name,npals)
@@ -583,7 +583,7 @@ subroutine h5imget_npalettes_f(loc_id,&
   integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
   character(len=*), intent(in) :: dset_name          ! name of the dataset
   integer(hsize_t), intent(inout) :: npals           ! palettes
-  integer :: namelen                                 ! name length
+  integer(size_t) :: namelen                                 ! name length
   end function h5imget_npalettes_c
  end interface
 
@@ -631,7 +631,7 @@ subroutine h5imget_palette_info_f(loc_id,&
  integer, intent(in) :: pal_number                     ! palette number
  integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
  integer :: errcode                                    ! error code
- integer :: namelen                                    ! name length
+ integer(size_t) :: namelen                                    ! name length
 
  interface
   integer function h5imget_palette_info_c(loc_id,namelen,dset_name,pal_number,dims)
@@ -645,7 +645,7 @@ subroutine h5imget_palette_info_f(loc_id,&
   character(len=*), intent(in) :: dset_name             ! name of the dataset
   integer, intent(in) :: pal_number                     ! palette number
   integer(hsize_t), dimension(*), intent(inout) :: dims ! dimensions
-  integer :: namelen                                    ! name length
+  integer(size_t) :: namelen                                    ! name length
   end function h5imget_palette_info_c
  end interface
 
@@ -694,7 +694,7 @@ subroutine h5imget_palette_f(loc_id,&
  integer, intent(in) :: pal_number                  ! palette number
  integer, intent(inout), dimension(*) :: buf        ! buffer
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
+ integer(size_t) :: namelen                                 ! name length
 
  interface
   integer function h5imget_palette_c(loc_id,namelen,dset_name,pal_number,buf)
@@ -705,7 +705,7 @@ subroutine h5imget_palette_f(loc_id,&
   !DEC$ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer :: namelen                                      ! lenght of name buffer
+  integer(size_t) :: namelen                                      ! length of name buffer
   character(len=*), intent(in) :: dset_name               ! name of the dataset
   integer, intent(in) :: pal_number                       ! palette number
   integer, intent(inout), dimension(*) :: buf             ! buffer
@@ -750,7 +750,7 @@ integer function h5imis_palette_f(loc_id,&
  integer(hid_t),   intent(in) :: loc_id             ! file or group identifier
  character(len=*), intent(in) :: dset_name          ! name of the dataset
  integer :: errcode                                 ! error code
- integer :: namelen                                 ! name length
+ integer(size_t) :: namelen                                 ! name length
 
  interface
   integer function h5imis_palette_c(loc_id,namelen,dset_name)
@@ -761,7 +761,7 @@ integer function h5imis_palette_f(loc_id,&
   !DEC$ENDIF
   !DEC$ATTRIBUTES reference :: dset_name
   integer(hid_t),   intent(in) :: loc_id                  ! file or group identifier
-  integer :: namelen                                      ! lenght of name buffer
+  integer(size_t) :: namelen                              ! length of name buffer
   character(len=*), intent(in) :: dset_name               ! name of the dataset
   end function h5imis_palette_c
  end interface
diff --git a/hl/fortran/src/H5LTf90proto.h b/hl/fortran/src/H5LTf90proto.h
index 332a7e2..532d9d8 100644
--- a/hl/fortran/src/H5LTf90proto.h
+++ b/hl/fortran/src/H5LTf90proto.h
@@ -22,8 +22,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+/* These definitions should match those in fortran/src/H5f90kit.c */
 
-H5_FCDLL char*  HD5f2cstring (_fcd fdesc, int len);
+H5_FCDLL char*  HD5f2cstring (_fcd fdesc, size_t len);
 H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
 
 /*
@@ -204,7 +205,7 @@ H5_FCDLL void HD5packFstring (char *src, char *dest, size_t len);
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, int_f *dimnamelen);
+nh5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen);
 
 HDF5_HL_F90CSTUBDLL
 int_f
@@ -224,7 +225,7 @@ nh5dsis_scale_c(hid_t_f *did, int_f *is_scale);
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, int_f *labellen);
+nh5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen);
 
 HDF5_HL_F90CSTUBDLL
 int_f
@@ -242,7 +243,7 @@ nh5dsget_num_scales_c( hid_t_f *did, int_f *idx, int_f *num_scales);
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      int_f *rank,
                      hsize_t_f *dims,
@@ -252,7 +253,7 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -262,7 +263,7 @@ nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -272,7 +273,7 @@ nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -282,7 +283,7 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -292,7 +293,7 @@ nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -302,7 +303,7 @@ nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -312,7 +313,7 @@ nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -323,7 +324,7 @@ nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -333,7 +334,7 @@ nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -343,7 +344,7 @@ nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -353,7 +354,7 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -363,7 +364,7 @@ nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -373,7 +374,7 @@ nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -383,7 +384,7 @@ nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -394,7 +395,7 @@ nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -404,7 +405,7 @@ nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -414,7 +415,7 @@ nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -424,7 +425,7 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -434,7 +435,7 @@ nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -444,7 +445,7 @@ nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -454,7 +455,7 @@ nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -464,7 +465,7 @@ nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -474,7 +475,7 @@ nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -484,7 +485,7 @@ nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -494,7 +495,7 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -504,7 +505,7 @@ nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -514,7 +515,7 @@ nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -524,7 +525,7 @@ nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -534,7 +535,7 @@ nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -544,7 +545,7 @@ nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -554,7 +555,7 @@ nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -564,7 +565,7 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -574,7 +575,7 @@ nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -584,7 +585,7 @@ nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -594,7 +595,7 @@ nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -604,7 +605,7 @@ nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -614,7 +615,7 @@ nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -624,7 +625,7 @@ nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -634,7 +635,7 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -644,7 +645,7 @@ nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -654,7 +655,7 @@ nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -664,7 +665,7 @@ nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -674,7 +675,7 @@ nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      hid_t_f *type_id,
                      void *buf,
@@ -684,7 +685,7 @@ nh5ltread_dataset_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -693,7 +694,7 @@ nh5ltread_dataset_int1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -702,7 +703,7 @@ nh5ltread_dataset_int2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -711,7 +712,7 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -720,7 +721,7 @@ nh5ltread_dataset_int4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -729,7 +730,7 @@ nh5ltread_dataset_int5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -738,7 +739,7 @@ nh5ltread_dataset_int6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_int7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -747,7 +748,7 @@ nh5ltread_dataset_int7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -756,7 +757,7 @@ nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -765,7 +766,7 @@ nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -774,7 +775,7 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -783,7 +784,7 @@ nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -792,7 +793,7 @@ nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -802,7 +803,7 @@ nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -811,7 +812,7 @@ nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -820,7 +821,7 @@ nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -829,7 +830,7 @@ nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -838,7 +839,7 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -847,7 +848,7 @@ nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -856,7 +857,7 @@ nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -865,7 +866,7 @@ nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -874,7 +875,7 @@ nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -883,7 +884,7 @@ nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -892,7 +893,7 @@ nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -901,7 +902,7 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -910,7 +911,7 @@ nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -919,7 +920,7 @@ nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -928,7 +929,7 @@ nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -937,7 +938,7 @@ nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -946,7 +947,7 @@ nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -955,7 +956,7 @@ nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -964,7 +965,7 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -973,7 +974,7 @@ nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -982,7 +983,7 @@ nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -991,7 +992,7 @@ nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1000,7 +1001,7 @@ nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1009,7 +1010,7 @@ nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1018,7 +1019,7 @@ nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1027,7 +1028,7 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1036,7 +1037,7 @@ nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1045,7 +1046,7 @@ nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1054,7 +1055,7 @@ nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1063,9 +1064,9 @@ nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltset_attribute_int_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd dsetname,
-                         int_f *attrnamelen,
+                         size_t_f *attrnamelen,
                          _fcd attrname,
                          size_t_f *size,
                          void *buf);
@@ -1073,9 +1074,9 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltset_attribute_float_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd dsetname,
-                           int_f *attrnamelen,
+                           size_t_f *attrnamelen,
                            _fcd attrname,
                            size_t_f *size,
                            void *buf);
@@ -1083,9 +1084,9 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltset_attribute_double_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
                             size_t_f *size,
                             void *buf);
@@ -1093,68 +1094,68 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltset_attribute_string_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
-                            int_f *buflen,
+                            size_t_f *buflen,
                             void *buf);
 
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_attribute_int_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd dsetname,
-                         int_f *attrnamelen,
+                         size_t_f *attrnamelen,
                          _fcd attrname,
                          void *buf);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_attribute_float_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd dsetname,
-                           int_f *attrnamelen,
+                           size_t_f *attrnamelen,
                            _fcd attrname,
                            void *buf);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_attribute_double_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
                             void *buf);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_attribute_string_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
                             _fcd buf,
-			    size_t_f *buf_size);
+                            size_t_f *buf_size);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltfind_dataset_c(hid_t_f *loc_id,
-                    int_f *namelen,
+                    size_t_f *namelen,
                     _fcd name);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_dataset_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         hsize_t_f *dims,
                         int_f *type_class,
@@ -1163,17 +1164,17 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd dsetname,
-                           int_f *attrnamelen,
+                           size_t_f *attrnamelen,
                            _fcd attrname,
                            int_f *rank);
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltget_attribute_info_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *attrnamelen,
+                          size_t_f *attrnamelen,
                           _fcd attrname,
                           hsize_t_f *dims,
                           int_f *type_class,
@@ -1182,24 +1183,24 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltmake_dataset_string_c (hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
-                            int_f *buflen,
+                            size_t_f *buflen,
                             char *buf);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltread_dataset_string_c (hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             char *buf);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5ltpath_valid_c(hid_t_f *loc_id, 
-		  _fcd path, 
-		  int_f *pathlen, 
-		  int_f *check_object_valid_c);
+                  _fcd path, 
+                  size_t_f *pathlen, 
+                  int_f *check_object_valid_c);
 
 /*-------------------------------------------------------------------------
 * Image
@@ -1209,7 +1210,7 @@ nh5ltpath_valid_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5immake_image_8bit_c (hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         hsize_t_f *width,
                         hsize_t_f *height,
@@ -1217,16 +1218,16 @@ nh5immake_image_8bit_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imread_image_c (hid_t_f *loc_id,
-                   int_f *namelen,
+                   size_t_f *namelen,
                    _fcd name,
                    int_f *buf);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5immake_image_24bit_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
-                         int_f *ilen,
+                         size_t_f *ilen,
                          _fcd il,
                          hsize_t_f *width,
                          hsize_t_f *height,
@@ -1234,27 +1235,27 @@ nh5immake_image_24bit_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imget_image_info_c(hid_t_f *loc_id,
-                      int_f *namelen,
+                      size_t_f *namelen,
                       _fcd name,
                       hsize_t_f *width,
                       hsize_t_f *height,
                       hsize_t_f *planes,
                       hsize_t_f *npals,
-                      int_f *ilen,
+                      size_t_f *ilen,
                       _fcd interlace);
 
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imis_image_c(hid_t_f *loc_id,
-                int_f *namelen,
+                size_t_f *namelen,
                 _fcd name);
 
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5immake_palette_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      hsize_t_f *dims,
                      void *buf);
@@ -1262,23 +1263,23 @@ nh5immake_palette_c (hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imlink_palette_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
-                     int_f *ilen,
+                     size_t_f *ilen,
                      _fcd pal_name);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imunlink_palette_c (hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *ilen,
+                       size_t_f *ilen,
                        _fcd pal_name);
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imget_npalettes_c(hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      hsize_t_f *npals);
 
@@ -1286,7 +1287,7 @@ nh5imget_npalettes_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imget_palette_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         int_f *pal_number,
                         hsize_t_f *dims);
@@ -1294,7 +1295,7 @@ nh5imget_palette_info_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imget_palette_c(hid_t_f *loc_id,
-                   int_f *namelen,
+                   size_t_f *namelen,
                    _fcd name,
                    int_f *pal_number,
                    void *buf);
@@ -1302,7 +1303,7 @@ nh5imget_palette_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5imis_palette_c(hid_t_f *loc_id,
-                  int_f *namelen,
+                  size_t_f *namelen,
                   _fcd name);
 
 
@@ -1314,10 +1315,10 @@ nh5imis_palette_c(hid_t_f *loc_id,
 
 HDF5_HL_F90CSTUBDLL
 int_f
-nh5tbmake_table_c(int_f *namelen1,
+nh5tbmake_table_c(size_t_f *namelen1,
                   _fcd name1,
                   hid_t_f *loc_id,
-                  int_f *namelen,
+                  size_t_f *namelen,
                   _fcd name,
                   hsize_t_f *nfields,
                   hsize_t_f *nrecords,
@@ -1326,16 +1327,16 @@ nh5tbmake_table_c(int_f *namelen1,
                   hid_t_f *field_types,
                   hsize_t_f *chunk_size,
                   int_f *compress,
-                  int_f *char_len_field_names, /* field_names lenghts */
-		  int_f *max_char_size_field_names, /* char len of fields */
+                  size_t_f *char_len_field_names, /* field_names lenghts */
+                  size_t_f *max_char_size_field_names, /* char len of fields */
                   _fcd buf);          /* field_names */
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_name_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
-                        int_f *namelen1,
+                        size_t_f *namelen1,
                         _fcd field_name,
                         hsize_t_f *start,
                         hsize_t_f *nrecords,
@@ -1345,9 +1346,9 @@ nh5tbwrite_field_name_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
-                            int_f *namelen1,
+                            size_t_f *namelen1,
                             _fcd field_name,
                             hsize_t_f *start,
                             hsize_t_f *nrecords,
@@ -1357,9 +1358,9 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -1369,9 +1370,9 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -1381,9 +1382,9 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -1393,9 +1394,9 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_name_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hsize_t_f *start,
                        hsize_t_f *nrecords,
@@ -1405,9 +1406,9 @@ nh5tbread_field_name_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_name_int_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -1417,9 +1418,9 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_name_fl_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *namelen1,
+                          size_t_f *namelen1,
                           _fcd field_name,
                           hsize_t_f *start,
                           hsize_t_f *nrecords,
@@ -1429,9 +1430,9 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_name_dl_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *namelen1,
+                          size_t_f *namelen1,
                           _fcd field_name,
                           hsize_t_f *start,
                           hsize_t_f *nrecords,
@@ -1441,9 +1442,9 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_name_st_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *namelen1,
+                          size_t_f *namelen1,
                           _fcd field_name,
                           hsize_t_f *start,
                           hsize_t_f *nrecords,
@@ -1453,7 +1454,7 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_index_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *field_index,
                          hsize_t_f *start,
@@ -1464,7 +1465,7 @@ nh5tbwrite_field_index_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
-                             int_f *namelen,
+                             size_t_f *namelen,
                              _fcd name,
                              int_f *field_index,
                              hsize_t_f *start,
@@ -1475,7 +1476,7 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -1486,7 +1487,7 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -1497,7 +1498,7 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -1508,7 +1509,7 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_index_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         int_f *field_index,
                         hsize_t_f *start,
@@ -1519,7 +1520,7 @@ nh5tbread_field_index_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_index_int_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -1530,7 +1531,7 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_index_fl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *field_index,
                            hsize_t_f *start,
@@ -1541,7 +1542,7 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_index_dl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *field_index,
                            hsize_t_f *start,
@@ -1552,7 +1553,7 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbread_field_index_st_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *field_index,
                            hsize_t_f *start,
@@ -1563,9 +1564,9 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbinsert_field_c(hid_t_f *loc_id,
-                    int_f *namelen,
+                    size_t_f *namelen,
                     _fcd name,
-                    int_f *namelen1,
+                    size_t_f *namelen1,
                     _fcd field_name,
                     hid_t_f *field_type,
                     int_f *position,
@@ -1574,9 +1575,9 @@ nh5tbinsert_field_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbinsert_field_int_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
-                        int_f *namelen1,
+                        size_t_f *namelen1,
                         _fcd field_name,
                         hid_t_f *field_type,
                         int_f *position,
@@ -1584,9 +1585,9 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbinsert_field_fl_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hid_t_f *field_type,
                        int_f *position,
@@ -1594,9 +1595,9 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbinsert_field_dl_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hid_t_f *field_type,
                        int_f *position,
@@ -1604,9 +1605,9 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbinsert_field_st_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hid_t_f *field_type,
                        int_f *position,
@@ -1614,16 +1615,16 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbdelete_field_c(hid_t_f *loc_id,
-                    int_f *namelen,
+                    size_t_f *namelen,
                     _fcd name,
-                    int_f *namelen1,
+                    size_t_f *namelen1,
                     _fcd field_name);
 
 
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbget_table_info_c(hid_t_f *loc_id,
-                      int_f *namelen,
+                      size_t_f *namelen,
                       _fcd name,
                       hsize_t_f *nfields,
                       hsize_t_f *nrecords);
@@ -1631,16 +1632,16 @@ nh5tbget_table_info_c(hid_t_f *loc_id,
 HDF5_HL_F90CSTUBDLL
 int_f
 nh5tbget_field_info_c(hid_t_f *loc_id,
-                      int_f *namelen,
+                      size_t_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,
-		      int_f *lenmax,
+                      size_t_f *namelen2,
+                      size_t_f *lenmax,
                       _fcd field_names,
-		      int_f *maxlen_out);    
+                      size_t_f *maxlen_out);    
 
 
 #endif /* _H5LTf90proto_H */
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 4f8f7b6..1e0a236 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -40,7 +40,7 @@
 
 int_f
 nh5ltmake_dataset_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      int_f *rank,
                      hsize_t_f *dims,
@@ -49,25 +49,20 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
 {
     int     ret_value = -1;
     herr_t  ret;
-    hid_t   c_loc_id;
-    hid_t   c_type_id;
     char    *c_name = NULL;
     hsize_t *c_dims = NULL;
-    int     c_namelen;
     int     i;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_dims =  HDmalloc(sizeof(hsize_t) * (*rank ));
+    c_dims =  (hsize_t *)HDmalloc(sizeof(hsize_t) * ( (size_t)*rank ));
     if (c_dims == NULL)
         goto done;
-
     /*
     * transpose dimension arrays because of C-FORTRAN storage order
     */
@@ -79,11 +74,8 @@ nh5ltmake_dataset_c (hid_t_f *loc_id,
     /*
     * call H5LTmake_dataset function.
     */
-    c_loc_id = (hid_t)*loc_id;
-    c_type_id = (hid_t)*type_id;
-
-    ret = H5LTmake_dataset(c_loc_id, c_name, *rank, c_dims, c_type_id, buf );
 
+    ret = H5LTmake_dataset((hid_t)*loc_id, c_name, (int)*rank, c_dims, (hid_t)*type_id, buf );
     if (ret < 0)
         goto done;
 
@@ -99,7 +91,7 @@ done:
 
 int_f
 nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -110,7 +102,7 @@ nh5ltmake_dataset_int1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -121,7 +113,7 @@ nh5ltmake_dataset_int2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -132,7 +124,7 @@ nh5ltmake_dataset_int3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -143,7 +135,7 @@ nh5ltmake_dataset_int4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -154,7 +146,7 @@ nh5ltmake_dataset_int5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -165,7 +157,7 @@ nh5ltmake_dataset_int6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -176,7 +168,7 @@ nh5ltmake_dataset_int7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -187,7 +179,7 @@ nh5ltmake_dataset_fl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -198,7 +190,7 @@ nh5ltmake_dataset_fl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -209,7 +201,7 @@ nh5ltmake_dataset_fl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -220,7 +212,7 @@ nh5ltmake_dataset_fl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -231,7 +223,7 @@ nh5ltmake_dataset_fl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -242,7 +234,7 @@ nh5ltmake_dataset_fl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -253,7 +245,7 @@ nh5ltmake_dataset_fl7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -264,7 +256,7 @@ nh5ltmake_dataset_dl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -275,7 +267,7 @@ nh5ltmake_dataset_dl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -286,7 +278,7 @@ nh5ltmake_dataset_dl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -297,7 +289,7 @@ nh5ltmake_dataset_dl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -308,7 +300,7 @@ nh5ltmake_dataset_dl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -319,7 +311,7 @@ nh5ltmake_dataset_dl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank,
                          hsize_t_f *dims,
@@ -330,7 +322,7 @@ nh5ltmake_dataset_dl7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -341,7 +333,7 @@ nh5ltmake_dataset_nint1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -352,7 +344,7 @@ nh5ltmake_dataset_nint2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -363,7 +355,7 @@ nh5ltmake_dataset_nint3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -374,7 +366,7 @@ nh5ltmake_dataset_nint4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -385,7 +377,7 @@ nh5ltmake_dataset_nint5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -396,7 +388,7 @@ nh5ltmake_dataset_nint6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *rank,
                            hsize_t_f *dims,
@@ -407,7 +399,7 @@ nh5ltmake_dataset_nint7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -418,7 +410,7 @@ nh5ltmake_dataset_nfl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -429,7 +421,7 @@ nh5ltmake_dataset_nfl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -440,7 +432,7 @@ nh5ltmake_dataset_nfl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -451,7 +443,7 @@ nh5ltmake_dataset_nfl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -462,7 +454,7 @@ nh5ltmake_dataset_nfl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -473,7 +465,7 @@ nh5ltmake_dataset_nfl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -484,7 +476,7 @@ nh5ltmake_dataset_nfl7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -495,7 +487,7 @@ nh5ltmake_dataset_ndl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -506,7 +498,7 @@ nh5ltmake_dataset_ndl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -517,7 +509,7 @@ nh5ltmake_dataset_ndl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -528,7 +520,7 @@ nh5ltmake_dataset_ndl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -539,7 +531,7 @@ nh5ltmake_dataset_ndl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -550,7 +542,7 @@ nh5ltmake_dataset_ndl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           int_f *rank,
                           hsize_t_f *dims,
@@ -580,7 +572,7 @@ nh5ltmake_dataset_ndl7_c (hid_t_f *loc_id,
 
 int_f
 nh5ltread_dataset_c (hid_t_f *loc_id,
-                     int_f *namelen,
+                     size_t_f *namelen,
                      _fcd name,
                      hid_t_f *type_id,
                      void *buf,
@@ -591,13 +583,11 @@ nh5ltread_dataset_c (hid_t_f *loc_id,
     hid_t   c_loc_id;
     hid_t   c_type_id;
     char    *c_name = NULL;
-    int     c_namelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -623,7 +613,7 @@ done:
 
 int_f
 nh5ltread_dataset_int1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -633,7 +623,7 @@ nh5ltread_dataset_int1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_int2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -643,7 +633,7 @@ nh5ltread_dataset_int2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_int3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -653,7 +643,7 @@ nh5ltread_dataset_int3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_int4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -663,7 +653,7 @@ nh5ltread_dataset_int4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_int5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -673,7 +663,7 @@ nh5ltread_dataset_int5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_int6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -683,7 +673,7 @@ nh5ltread_dataset_int6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_int7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -693,7 +683,7 @@ nh5ltread_dataset_int7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -703,7 +693,7 @@ nh5ltread_dataset_fl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -713,7 +703,7 @@ nh5ltread_dataset_fl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -723,7 +713,7 @@ nh5ltread_dataset_fl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -733,7 +723,7 @@ nh5ltread_dataset_fl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -743,7 +733,7 @@ nh5ltread_dataset_fl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -753,7 +743,7 @@ nh5ltread_dataset_fl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -763,7 +753,7 @@ nh5ltread_dataset_fl7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -773,7 +763,7 @@ nh5ltread_dataset_dl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -783,7 +773,7 @@ nh5ltread_dataset_dl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -793,7 +783,7 @@ nh5ltread_dataset_dl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -803,7 +793,7 @@ nh5ltread_dataset_dl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -813,7 +803,7 @@ nh5ltread_dataset_dl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -823,7 +813,7 @@ nh5ltread_dataset_dl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          hid_t_f *type_id,
                          void *buf,
@@ -833,7 +823,7 @@ nh5ltread_dataset_dl7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -843,7 +833,7 @@ nh5ltread_dataset_nint1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -853,7 +843,7 @@ nh5ltread_dataset_nint2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -863,7 +853,7 @@ nh5ltread_dataset_nint3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -873,7 +863,7 @@ nh5ltread_dataset_nint4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -883,7 +873,7 @@ nh5ltread_dataset_nint5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -893,7 +883,7 @@ nh5ltread_dataset_nint6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            hid_t_f *type_id,
                            void *buf,
@@ -903,7 +893,7 @@ nh5ltread_dataset_nint7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -913,7 +903,7 @@ nh5ltread_dataset_nfl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -923,7 +913,7 @@ nh5ltread_dataset_nfl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -933,7 +923,7 @@ nh5ltread_dataset_nfl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -943,7 +933,7 @@ nh5ltread_dataset_nfl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -953,7 +943,7 @@ nh5ltread_dataset_nfl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -963,7 +953,7 @@ nh5ltread_dataset_nfl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -973,7 +963,7 @@ nh5ltread_dataset_nfl7_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -983,7 +973,7 @@ nh5ltread_dataset_ndl1_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -993,7 +983,7 @@ nh5ltread_dataset_ndl2_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1003,7 +993,7 @@ nh5ltread_dataset_ndl3_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1013,7 +1003,7 @@ nh5ltread_dataset_ndl4_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1023,7 +1013,7 @@ nh5ltread_dataset_ndl5_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1033,7 +1023,7 @@ nh5ltread_dataset_ndl6_c (hid_t_f *loc_id,
 }
 int_f
 nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
                           hid_t_f *type_id,
                           void *buf,
@@ -1062,29 +1052,25 @@ nh5ltread_dataset_ndl7_c (hid_t_f *loc_id,
 
 int_f
 nh5ltmake_dataset_string_c (hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
-                            int_f *buflen,
+                            size_t_f *buflen,
                             char *buf)
 {
     int     ret_value = -1;
     herr_t  ret;
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
     char    *c_buf = NULL;
-    int     c_buflen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_buflen = *buflen;
-    c_buf = (char *)HD5f2cstring(buf, c_buflen);
+    c_buf = (char *)HD5f2cstring(buf, (size_t)*buflen);
     if (c_buf == NULL)
         goto done;
 
@@ -1131,7 +1117,7 @@ done:
 
 int_f
 nh5ltread_dataset_string_c (hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             char *buf)
 {
@@ -1139,13 +1125,11 @@ nh5ltread_dataset_string_c (hid_t_f *loc_id,
     herr_t  ret;
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -1191,9 +1175,9 @@ done:
 
 int_f
 nh5ltset_attribute_int_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd dsetname,
-                         int_f *attrnamelen,
+                         size_t_f *attrnamelen,
                          _fcd attrname,
                          size_t_f *size,
                          void *buf)
@@ -1203,20 +1187,16 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
     size_t  c_size;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -1227,11 +1207,11 @@ nh5ltset_attribute_int_c(hid_t_f *loc_id,
     c_size   = (size_t)*size;
 
     if (sizeof(int_f) == sizeof(int))
-        ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,buf,c_size);
+        ret = H5LTset_attribute_int(c_loc_id,c_name,c_attrname,(const int *)buf,c_size);
     else if (sizeof(int_f) == sizeof(long))
-        ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,buf,c_size);
+      ret = H5LTset_attribute_long(c_loc_id,c_name,c_attrname,(const long *)buf,c_size);
     else if (sizeof(int_f) == sizeof(long long))
-        ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,buf,c_size);
+        ret = H5LTset_attribute_long_long(c_loc_id,c_name,c_attrname,(const long long *)buf,c_size);
     else
         goto done;
 
@@ -1270,9 +1250,9 @@ done:
 
 int_f
 nh5ltset_attribute_float_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd dsetname,
-                           int_f *attrnamelen,
+                           size_t_f *attrnamelen,
                            _fcd attrname,
                            size_t_f *size,
                            void *buf)
@@ -1282,20 +1262,16 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
     size_t  c_size;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
          goto done;
 
-    c_attrnamelen = *attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
          goto done;
 
@@ -1305,7 +1281,7 @@ nh5ltset_attribute_float_c(hid_t_f *loc_id,
     c_loc_id = (hid_t)*loc_id;
     c_size   = (size_t)*size;
 
-    ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,buf,c_size);
+    ret = H5LTset_attribute_float(c_loc_id,c_name,c_attrname,(float *)buf,c_size);
 
     if (ret < 0)
          goto done;
@@ -1343,9 +1319,9 @@ done:
 
 int_f
 nh5ltset_attribute_double_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
                             size_t_f *size,
                             void *buf)
@@ -1355,20 +1331,16 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
     size_t  c_size;
 
     /*
     * Convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = *attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -1378,7 +1350,7 @@ nh5ltset_attribute_double_c(hid_t_f *loc_id,
     c_loc_id = (hid_t)*loc_id;
     c_size   = (size_t)*size;
 
-    ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,buf,c_size);
+    ret = H5LTset_attribute_double(c_loc_id,c_name,c_attrname,(double *)buf,c_size);
 
     if (ret < 0)
         goto done;
@@ -1416,11 +1388,11 @@ done:
 
 int_f
 nh5ltset_attribute_string_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
-                            int_f *buflen,
+                            size_t_f *buflen,
                             void *buf)
 {
     int     ret_value = -1;
@@ -1428,26 +1400,20 @@ nh5ltset_attribute_string_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
     char    *c_buf = NULL;
-    int     c_buflen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = *namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = *attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
-    c_buflen = *buflen;
-    c_buf = (char *)HD5f2cstring(buf, c_buflen);
+    c_buf = (char *)HD5f2cstring((_fcd)buf, (size_t)*buflen);
     if (c_buf == NULL)
         goto done;
 
@@ -1497,9 +1463,9 @@ done:
 
 int_f
 nh5ltget_attribute_int_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd dsetname,
-                         int_f *attrnamelen,
+                         size_t_f *attrnamelen,
                          _fcd attrname,
                          void *buf)
 {
@@ -1508,19 +1474,15 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -1530,11 +1492,11 @@ nh5ltget_attribute_int_c(hid_t_f *loc_id,
     c_loc_id = (hid_t)*loc_id;
 
     if(sizeof(int_f) == sizeof(int))
-        ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,buf);
+      ret = H5LTget_attribute_int(c_loc_id,c_name,c_attrname,(int *)buf);
     else if (sizeof(int_f) == sizeof(long))
-        ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,buf);
+      ret = H5LTget_attribute_long(c_loc_id,c_name,c_attrname,(long *)buf);
     else if (sizeof(int_f) == sizeof(long long))
-        ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,buf);
+      ret = H5LTget_attribute_long_long(c_loc_id,c_name,c_attrname,(long long *)buf);
     else
         goto done;
 
@@ -1575,9 +1537,9 @@ done:
 
 int_f
 nh5ltget_attribute_float_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd dsetname,
-                           int_f *attrnamelen,
+                           size_t_f *attrnamelen,
                            _fcd attrname,
                            void *buf)
 {
@@ -1586,19 +1548,15 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -1607,7 +1565,7 @@ nh5ltget_attribute_float_c(hid_t_f *loc_id,
     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,buf);
+    ret = H5LTget_attribute_float(c_loc_id,c_name,c_attrname,(float*)buf);
 
     if (ret < 0)
         goto done;
@@ -1644,9 +1602,9 @@ done:
 
 int_f
 nh5ltget_attribute_double_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
                             void *buf)
 {
@@ -1655,19 +1613,15 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
 
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -1676,7 +1630,7 @@ nh5ltget_attribute_double_c(hid_t_f *loc_id,
     */
     c_loc_id = (hid_t)*loc_id;
 
-    ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,buf);
+    ret = H5LTget_attribute_double(c_loc_id,c_name,c_attrname,(double *)buf);
 
     if (ret < 0)
         goto done;
@@ -1714,9 +1668,9 @@ done:
 
 int_f
 nh5ltget_attribute_string_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd dsetname,
-                            int_f *attrnamelen,
+                            size_t_f *attrnamelen,
                             _fcd attrname,
                             _fcd buf, size_t_f *buf_size)
 {
@@ -1725,25 +1679,21 @@ nh5ltget_attribute_string_c(hid_t_f *loc_id,
     char    *c_name = NULL;
     char    *c_attrname = NULL;
     char    *c_buf = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
 
     /*
     * Convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
     /*
      * Allocate buffer to hold C attribute string
      */
-    if ((c_buf = HDmalloc((size_t)*buf_size + 1)) == NULL)
+    if ((c_buf = (char *)HDmalloc((size_t)*buf_size + 1)) == NULL)
       goto done;
 
     /*
@@ -1793,7 +1743,7 @@ done:
 
 int_f
 nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *rank)
 {
@@ -1801,14 +1751,12 @@ nh5ltget_dataset_ndims_c(hid_t_f *loc_id,
     herr_t  ret;
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
     int     c_rank;
 
     /*
     * Convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -1855,19 +1803,17 @@ done:
 
 int_f
 nh5ltfind_dataset_c(hid_t_f *loc_id,
-                    int_f *namelen,
+                    size_t_f *namelen,
                     _fcd name)
 {
     hid_t   c_loc_id;
     char    *c_name = NULL;
-    int     c_namelen;
     herr_t  ret;
 
     /*
     * Convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL) return -1;
 
     /*
@@ -1905,7 +1851,7 @@ nh5ltfind_dataset_c(hid_t_f *loc_id,
 
 int_f
 nh5ltget_dataset_info_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         hsize_t_f *dims,
                         int_f *type_class,
@@ -1915,7 +1861,6 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
     herr_t       ret;
     hid_t        c_loc_id;
     char         *c_name = NULL;
-    int          c_namelen;
     H5T_class_t  c_classtype;
     size_t       c_type_size;
     hsize_t      c_dims[32];
@@ -1925,8 +1870,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
@@ -1986,9 +1930,9 @@ done:
 
 int_f
 nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd dsetname,
-                           int_f *attrnamelen,
+                           size_t_f *attrnamelen,
                            _fcd attrname,
                            int_f *rank)
 {
@@ -1997,20 +1941,16 @@ nh5ltget_attribute_ndims_c(hid_t_f *loc_id,
     hid_t   c_loc_id;
     char    *c_name = NULL;
     char    *c_attrname = NULL;
-    int     c_namelen;
-    int     c_attrnamelen;
     int     c_rank;
 
     /*
     * Convert FORTRAN name to C name
     */
-    c_namelen =(int) *namelen;
-    c_name = (char *)HD5f2cstring(dsetname, c_namelen);
+    c_name = (char *)HD5f2cstring(dsetname, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -2059,9 +1999,9 @@ done:
 
 int_f
 nh5ltget_attribute_info_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *attrnamelen,
+                          size_t_f *attrnamelen,
                           _fcd attrname,
                           hsize_t_f *dims,
                           int_f *type_class,
@@ -2072,8 +2012,6 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
     hid_t        c_loc_id;
     char         *c_name = NULL;
     char         *c_attrname = NULL;
-    int          c_namelen;
-    int          c_attrnamelen;
     H5T_class_t  c_classtype;
     size_t       c_type_size;
     hsize_t      c_dims[32];
@@ -2083,13 +2021,11 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
     /*
     * convert FORTRAN name to C name
     */
-    c_namelen = (int)*namelen;
-    c_name = (char *)HD5f2cstring(name, c_namelen);
+    c_name = (char *)HD5f2cstring(name, (size_t)*namelen);
     if (c_name == NULL)
         goto done;
 
-    c_attrnamelen = (int)*attrnamelen;
-    c_attrname = (char *)HD5f2cstring(attrname, c_attrnamelen);
+    c_attrname = (char *)HD5f2cstring(attrname, (size_t)*attrnamelen);
     if (c_attrname == NULL)
         goto done;
 
@@ -2152,9 +2088,9 @@ done:
 
 int_f
 nh5ltpath_valid_c(hid_t_f *loc_id, 
-		  _fcd path, 
-		  int_f *pathlen, 
-		  int_f *check_object_valid_c)
+                  _fcd path, 
+                  size_t_f *pathlen, 
+                  int_f *check_object_valid_c)
 {
     htri_t ret = -1;
     char *c_path = NULL;
diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90
index 8df024e..9393f7f 100644
--- a/hl/fortran/src/H5LTff.f90
+++ b/hl/fortran/src/H5LTff.f90
@@ -171,11 +171,11 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER, INTENT(in), DIMENSION(*) :: buf           ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltmake_dataset_int1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -187,10 +187,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), DIMENSION(*) :: buf                ! data buffer
        END FUNCTION h5ltmake_dataset_int1_c
     END INTERFACE
@@ -237,10 +237,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -254,10 +254,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltmake_dataset_int2_c
@@ -305,10 +305,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -322,10 +322,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_int3_c
@@ -368,10 +368,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf  ! data buffer
 
@@ -385,10 +385,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf      ! data buffer
        END FUNCTION h5ltmake_dataset_int4_c
@@ -431,10 +431,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf  ! data buffer
 
@@ -448,10 +448,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf      ! data buffer
        END FUNCTION h5ltmake_dataset_int5_c
@@ -494,10 +494,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf  ! data buffer
 
@@ -511,10 +511,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf      ! data buffer
        END FUNCTION h5ltmake_dataset_int6_c
@@ -557,10 +557,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf  ! data buffer
 
@@ -574,10 +574,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf      ! data buffer
        END FUNCTION h5ltmake_dataset_int7_c
@@ -626,11 +626,11 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     REAL, INTENT(in), DIMENSION(*) :: buf              ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltmake_dataset_fl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -642,10 +642,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
        END FUNCTION h5ltmake_dataset_fl1_c
     END INTERFACE
@@ -692,10 +692,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -709,10 +709,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltmake_dataset_fl2_c
@@ -760,10 +760,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -777,10 +777,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_fl3_c
@@ -823,10 +823,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -840,10 +840,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf ! data buffer
        END FUNCTION h5ltmake_dataset_fl4_c
@@ -886,10 +886,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -903,10 +903,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf ! data buffer
        END FUNCTION h5ltmake_dataset_fl5_c
@@ -949,10 +949,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -966,10 +966,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf ! data buffer
        END FUNCTION h5ltmake_dataset_fl6_c
@@ -1012,10 +1012,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -1029,10 +1029,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf ! data buffer
        END FUNCTION h5ltmake_dataset_fl7_c
@@ -1080,11 +1080,11 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf  ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltmake_dataset_dl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -1096,10 +1096,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf       ! data buffer
        END FUNCTION h5ltmake_dataset_dl1_c
     END INTERFACE
@@ -1146,10 +1146,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -1163,10 +1163,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltmake_dataset_dl2_c
@@ -1214,10 +1214,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -1231,10 +1231,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_dl3_c
@@ -1277,10 +1277,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3), dims(4)) :: buf          ! data buffer
 
@@ -1294,10 +1294,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_dl4_c
@@ -1340,10 +1340,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -1357,10 +1357,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_dl5_c
@@ -1403,10 +1403,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -1420,10 +1420,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_dl6_c
@@ -1466,10 +1466,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -1483,10 +1483,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_dl7_c
@@ -1533,10 +1533,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER, INTENT(inout), DIMENSION(*) :: buf        ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltread_dataset_int1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1548,9 +1548,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(HID_T),   INTENT(IN) :: loc_id                  ! file or group identifier
          INTEGER(HID_T),   INTENT(IN) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(LEN=*), INTENT(IN) :: dset_name               ! name of the dataset
-         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims      ! size of the bufffer buf
+         INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims      ! size of the buffer buf
          INTEGER, INTENT(IN), DIMENSION(*) :: buf                ! data buffer
        END FUNCTION h5ltread_dataset_int1_c
     END INTERFACE
@@ -1596,9 +1596,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -1612,9 +1612,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltread_dataset_int2_c
@@ -1661,9 +1661,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -1677,9 +1677,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_int3_c
@@ -1722,9 +1722,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -1738,9 +1738,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_int4_c
@@ -1783,9 +1783,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -1799,9 +1799,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_int5_c
@@ -1844,9 +1844,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -1860,9 +1860,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_int6_c
@@ -1905,9 +1905,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -1921,9 +1921,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_int7_c
@@ -1971,10 +1971,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     REAL, INTENT(inout), DIMENSION(*) :: buf           ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltread_dataset_fl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -1986,9 +1986,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
        END FUNCTION h5ltread_dataset_fl1_c
     END INTERFACE
@@ -2035,9 +2035,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -2051,9 +2051,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltread_dataset_fl2_c
@@ -2100,9 +2100,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -2116,9 +2116,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_fl3_c
@@ -2161,9 +2161,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -2177,9 +2177,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_fl4_c
@@ -2222,9 +2222,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -2238,9 +2238,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_fl5_c
@@ -2283,9 +2283,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -2299,9 +2299,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_fl6_c
@@ -2344,9 +2344,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -2360,9 +2360,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_fl7_c
@@ -2410,10 +2410,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     DOUBLE PRECISION, INTENT(inout), DIMENSION(*) :: buf ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltread_dataset_dl1_c(loc_id,namelen,dset_name,type_id,buf,dims)
@@ -2425,9 +2425,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf       ! data buffer
        END FUNCTION h5ltread_dataset_dl1_c
     END INTERFACE
@@ -2473,9 +2473,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -2489,9 +2489,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltread_dataset_dl2_c
@@ -2538,9 +2538,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -2554,9 +2554,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_dl3_c
@@ -2599,9 +2599,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -2615,9 +2615,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_dl4_c
@@ -2660,9 +2660,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -2676,9 +2676,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_dl5_c
@@ -2721,9 +2721,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -2737,9 +2737,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_dl6_c
@@ -2782,9 +2782,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER(hid_t),   INTENT(in) :: type_id            ! datatype identifier
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -2798,9 +2798,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_dl7_c
@@ -2847,10 +2847,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER, INTENT(in), DIMENSION(*) :: buf           ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltmake_dataset_nint1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -2862,10 +2862,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), DIMENSION(*) :: buf                ! data buffer
        END FUNCTION h5ltmake_dataset_nint1_c
     END INTERFACE
@@ -2911,9 +2911,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -2928,10 +2928,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
        END FUNCTION h5ltmake_dataset_nint2_c
@@ -2979,9 +2979,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -2996,10 +2996,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_nint3_c
@@ -3042,9 +3042,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -3059,10 +3059,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_nint4_c
@@ -3105,9 +3105,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -3122,10 +3122,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_nint5_c
@@ -3168,9 +3168,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -3185,10 +3185,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_nint6_c
@@ -3231,9 +3231,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -3248,10 +3248,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf  ! data buffer
        END FUNCTION h5ltmake_dataset_nint7_c
@@ -3298,10 +3298,10 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     REAL, INTENT(in), DIMENSION(*) :: buf              ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltmake_dataset_nfl1_c(loc_id,namelen,dset_name,rank,dims,type_id,buf)
@@ -3313,10 +3313,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), DIMENSION(*) :: buf                   ! data buffer
        END FUNCTION h5ltmake_dataset_nfl1_c
     END INTERFACE
@@ -3362,9 +3362,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -3378,10 +3378,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
        END FUNCTION h5ltmake_dataset_nfl2_c
@@ -3428,9 +3428,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -3444,10 +3444,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_nfl3_c
@@ -3490,9 +3490,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -3506,10 +3506,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_nfl4_c
@@ -3552,9 +3552,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -3568,10 +3568,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_nfl5_c
@@ -3614,9 +3614,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -3630,10 +3630,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_nfl6_c
@@ -3676,9 +3676,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -3692,10 +3692,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_nfl7_c
@@ -3743,9 +3743,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1)) :: buf                          ! data buffer
 
@@ -3759,10 +3759,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1)) :: buf                               ! data buffer
        END FUNCTION h5ltmake_dataset_ndl1_c
@@ -3810,9 +3810,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -3826,10 +3826,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltmake_dataset_ndl2_c
@@ -3876,9 +3876,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -3892,10 +3892,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_ndl3_c
@@ -3938,9 +3938,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -3954,10 +3954,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_ndl4_c
@@ -4000,9 +4000,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -4016,10 +4016,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_ndl5_c
@@ -4062,9 +4062,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -4078,10 +4078,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_ndl6_c
@@ -4124,9 +4124,9 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(in) :: rank               ! rank
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(in), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -4140,10 +4140,10 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(in) :: rank                    ! rank
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(in), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltmake_dataset_ndl7_c
@@ -4188,9 +4188,9 @@ CONTAINS
 
     INTEGER(HID_T),   INTENT(IN) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1)) :: buf                          ! data buffer
 
@@ -4204,9 +4204,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1)) :: buf                               ! data buffer
        END FUNCTION h5ltread_dataset_nint1_c
@@ -4252,9 +4252,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -4268,9 +4268,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltread_dataset_nint2_c
@@ -4315,9 +4315,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -4331,9 +4331,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nint3_c
@@ -4374,9 +4374,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -4390,9 +4390,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nint4_c
@@ -4433,9 +4433,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -4449,9 +4449,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nint5_c
@@ -4492,9 +4492,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -4508,9 +4508,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nint6_c
@@ -4551,9 +4551,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     INTEGER, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -4567,9 +4567,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          INTEGER, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nint7_c
@@ -4615,9 +4615,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1)) :: buf                          ! data buffer
 
@@ -4631,9 +4631,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1)) :: buf                               ! data buffer
        END FUNCTION h5ltread_dataset_nfl1_c
@@ -4679,9 +4679,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -4695,9 +4695,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltread_dataset_nfl2_c
@@ -4742,9 +4742,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -4758,9 +4758,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nfl3_c
@@ -4801,9 +4801,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -4817,9 +4817,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nfl4_c
@@ -4860,9 +4860,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -4876,9 +4876,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nfl5_c
@@ -4919,9 +4919,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -4935,9 +4935,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nfl6_c
@@ -4978,9 +4978,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     REAL, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -4994,9 +4994,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          REAL, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_nfl7_c
@@ -5041,9 +5041,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1)) :: buf                          ! data buffer
 
@@ -5057,9 +5057,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1)) :: buf                               ! data buffer
        END FUNCTION h5ltread_dataset_ndl1_c
@@ -5105,9 +5105,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2)) :: buf                  ! data buffer
 
@@ -5121,9 +5121,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1),dims(2)) :: buf                       ! data buffer
        END FUNCTION h5ltread_dataset_ndl2_c
@@ -5168,9 +5168,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3)) :: buf          ! data buffer
 
@@ -5184,9 +5184,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_ndl3_c
@@ -5227,9 +5227,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf          ! data buffer
 
@@ -5243,9 +5243,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_ndl4_c
@@ -5286,9 +5286,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf          ! data buffer
 
@@ -5302,9 +5302,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_ndl5_c
@@ -5345,9 +5345,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf          ! data buffer
 
@@ -5361,9 +5361,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_ndl6_c
@@ -5404,9 +5404,9 @@ CONTAINS
 
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
-    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the bufffer buf
+    INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims ! size of the buffer buf
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
     DOUBLE PRECISION, INTENT(inout), &
          DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf          ! data buffer
 
@@ -5420,9 +5420,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
          INTEGER(hid_t),   INTENT(in) :: type_id                 ! datatype identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
-         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the bufffer buf
+         INTEGER(hsize_t), DIMENSION(*), INTENT(in) :: dims      ! size of the buffer buf
          DOUBLE PRECISION, INTENT(inout), &
               DIMENSION(dims(1),dims(2),dims(3),dims(4),dims(5),dims(6),dims(7)) :: buf               ! data buffer
        END FUNCTION h5ltread_dataset_ndl7_c
@@ -5457,20 +5457,18 @@ CONTAINS
        errcode )
 
     IMPLICIT NONE
-
     !
     !This definition is needed for Windows DLLs
     !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_string_f
     !DEC$endif
     !
-
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     CHARACTER(len=*), INTENT(in) :: buf                ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: buflen                                  ! buffer length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: buflen                          ! buffer length
 
     INTERFACE
        INTEGER FUNCTION h5ltmake_dataset_string_c(loc_id,namelen,dset_name,buflen,buf)
@@ -5481,8 +5479,8 @@ CONTAINS
          !DEC$ENDIF
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: buflen                                       ! lenght of data buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: buflen                               ! length of data buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: buf                     ! data buffer
        END FUNCTION h5ltmake_dataset_string_c
@@ -5529,7 +5527,7 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     CHARACTER(len=*), INTENT(inout) :: buf             ! data buffer
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltread_dataset_string_c(loc_id,namelen,dset_name,buf)
@@ -5540,7 +5538,7 @@ CONTAINS
          !DEC$ENDIF
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(inout) :: buf                  ! data buffer
        END FUNCTION h5ltread_dataset_string_c
@@ -5598,8 +5596,8 @@ CONTAINS
     INTEGER(size_t),  INTENT(in) :: size               ! size of attribute array
     INTEGER :: errcode                                 ! error code
     INTEGER, INTENT(in), DIMENSION(*) :: buf           ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
+    INTEGER(size_t) :: attrlen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltset_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
@@ -5611,8 +5609,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          INTEGER(size_t),  INTENT(in) :: size                    ! size of attribute array
@@ -5665,8 +5663,8 @@ CONTAINS
     INTEGER(size_t),  INTENT(in) :: size               ! size of attribute array
     INTEGER :: errcode                                 ! error code
     REAL, INTENT(in), DIMENSION(*) :: buf              ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: attrlen                         ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltset_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
@@ -5678,8 +5676,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          INTEGER(size_t),  INTENT(in) :: size                    ! size of attribute array
@@ -5732,8 +5730,8 @@ CONTAINS
     INTEGER(size_t),  INTENT(in) :: size               ! size of attribute array
     INTEGER :: errcode                                 ! error code
     DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf  ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: attrlen                         ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltset_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,size,buf)
@@ -5745,8 +5743,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          INTEGER(size_t),  INTENT(in) :: size                    ! size of attribute array
@@ -5798,9 +5796,9 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
     INTEGER :: errcode                                 ! error code
     CHARACTER(len=*), INTENT(in) :: buf                ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
-    INTEGER :: buflen                                  ! data buffer length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: attrlen                         ! name length
+    INTEGER(size_t) :: buflen                          ! data buffer length
 
     INTERFACE
        INTEGER FUNCTION h5ltset_attribute_string_c(loc_id,namelen,dset_name,attrlen,attr_name,buflen,buf)
@@ -5812,9 +5810,9 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
-         INTEGER :: buflen                                       ! data buffer length
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
+         INTEGER(size_t) :: buflen                               ! data buffer length
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          CHARACTER(len=*), INTENT(in) :: buf                     ! data buffer
@@ -5867,8 +5865,8 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
     INTEGER :: errcode                                 ! error code
     INTEGER, INTENT(inout), DIMENSION(*) :: buf        ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: attrlen                         ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_attribute_int_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
@@ -5880,11 +5878,11 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: attrlen                              ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
-         INTEGER, INTENT(inout), DIMENSION(*) :: buf             ! data buffer
+         INTEGER, INTENT(inout), DIMENSION(*) :: buf     ! data buffer
        END FUNCTION h5ltget_attribute_int_c
     END INTERFACE
 
@@ -5932,8 +5930,8 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
     INTEGER :: errcode                                 ! error code
     REAL, INTENT(inout), DIMENSION(*) :: buf           ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: attrlen                         ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_attribute_float_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
@@ -5945,8 +5943,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
+         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          REAL, INTENT(inout), DIMENSION(*) :: buf                ! data buffer
@@ -5996,8 +5994,8 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
     INTEGER :: errcode                                 ! error code
     DOUBLE PRECISION,INTENT(inout),DIMENSION(*) :: buf ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
+    INTEGER(size_t) :: attrlen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_attribute_double_c(loc_id,namelen,dset_name,attrlen,attr_name,buf)
@@ -6009,8 +6007,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
+         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          DOUBLE PRECISION, INTENT(inout), DIMENSION(*) :: buf    ! data buffer
@@ -6060,8 +6058,8 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
     INTEGER :: errcode                                 ! error code
     CHARACTER(len=*), INTENT(inout) :: buf             ! data buffer
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
+    INTEGER(size_t) :: attrlen                                 ! name length
     INTEGER(size_t) :: buf_size                        ! buf size
 
     INTERFACE
@@ -6074,8 +6072,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
+         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          CHARACTER(len=*), INTENT(inout) :: buf                  ! data buffer
@@ -6130,7 +6128,7 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER,          INTENT(inout) :: rank            ! rank
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_dataset_ndims_c(loc_id,namelen,dset_name,rank)
@@ -6141,7 +6139,7 @@ CONTAINS
          !DEC$ENDIF
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER,          INTENT(inout) :: rank                 ! rank
        END FUNCTION h5ltget_dataset_ndims_c
@@ -6186,7 +6184,7 @@ CONTAINS
     INTEGER(hid_t),   INTENT(in) :: loc_id             ! file or group identifier
     CHARACTER(len=*), INTENT(in) :: dset_name          ! name of the dataset
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltfind_dataset_c(loc_id,namelen,dset_name)
@@ -6197,7 +6195,7 @@ CONTAINS
          !DEC$ENDIF
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
        END FUNCTION h5ltfind_dataset_c
     END INTERFACE
@@ -6247,7 +6245,7 @@ CONTAINS
     INTEGER, INTENT(inout)         :: type_class       ! type class
     INTEGER(size_t), INTENT(inout) :: type_size        ! type size
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_dataset_info_c(loc_id,namelen,dset_name,dims,type_class,type_size)
@@ -6258,7 +6256,7 @@ CONTAINS
          !DEC$ENDIF
          !DEC$ATTRIBUTES reference :: dset_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims      ! dimensions
          INTEGER, INTENT(inout)         :: type_class            ! type class
@@ -6314,8 +6312,8 @@ CONTAINS
     CHARACTER(len=*), INTENT(in) :: attr_name          ! name of the attribute
     INTEGER,          INTENT(inout) :: rank            ! rank
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                                 ! name length
+    INTEGER(size_t) :: attrlen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_attribute_ndims_c(loc_id,namelen,dset_name,attrlen,attr_name,rank)
@@ -6327,8 +6325,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                                      ! length of name buffer
+         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          INTEGER,          INTENT(inout) :: rank                 ! rank
@@ -6383,8 +6381,8 @@ CONTAINS
     INTEGER, INTENT(inout)         :: type_class       ! type class
     INTEGER(size_t), INTENT(inout) :: type_size        ! type size
     INTEGER :: errcode                                 ! error code
-    INTEGER :: namelen                                 ! name length
-    INTEGER :: attrlen                                 ! name length
+    INTEGER(size_t) :: namelen                         ! name length
+    INTEGER(size_t) :: attrlen                                 ! name length
 
     INTERFACE
        INTEGER FUNCTION h5ltget_attribute_info_c(loc_id,namelen,dset_name,attrlen,attr_name,dims,type_class,type_size)
@@ -6396,8 +6394,8 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: dset_name
          !DEC$ATTRIBUTES reference :: attr_name
          INTEGER(hid_t),   INTENT(in) :: loc_id                  ! file or group identifier
-         INTEGER :: namelen                                      ! lenght of name buffer
-         INTEGER :: attrlen                                      ! lenght of attr name buffer
+         INTEGER(size_t) :: namelen                              ! length of name buffer
+         INTEGER(size_t) :: attrlen                                      ! length of attr name buffer
          CHARACTER(len=*), INTENT(in) :: dset_name               ! name of the dataset
          CHARACTER(len=*), INTENT(in) :: attr_name               ! name of the attribute
          INTEGER(hsize_t),DIMENSION(*),INTENT(inout):: dims      ! dimensions
@@ -6445,7 +6443,7 @@ CONTAINS
     LOGICAL         , INTENT(OUT) :: path_valid          ! Object status
     INTEGER         , INTENT(OUT) :: errcode             ! Error code: 0 on success and -1 on failure
 
-    INTEGER :: pathlen
+    INTEGER(size_t) :: pathlen
     INTEGER :: check_object_valid_c
     INTEGER :: status
 
@@ -6459,7 +6457,7 @@ CONTAINS
          !DEC$ATTRIBUTES reference :: path
          INTEGER(hid_t),   INTENT(in) :: loc_id  
          CHARACTER(len=*), INTENT(in) :: path
-         INTEGER :: pathlen
+         INTEGER(size_t) :: pathlen
          INTEGER :: check_object_valid_c
        END FUNCTION h5ltpath_valid_c
     END INTERFACE
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 0efc9a8..bf058fd 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -37,10 +37,10 @@
 *-------------------------------------------------------------------------
 */
 int_f
-nh5tbmake_table_c(int_f *namelen1,
+nh5tbmake_table_c(size_t_f *namelen1,
                   _fcd name1,
                   hid_t_f *loc_id,
-                  int_f *namelen,
+                  size_t_f *namelen,
                   _fcd name,
                   hsize_t_f *nfields,
                   hsize_t_f *nrecords,
@@ -49,8 +49,8 @@ nh5tbmake_table_c(int_f *namelen1,
                   hid_t_f *field_types,
                   hsize_t_f *chunk_size,
                   int_f *compress,
-                  int_f *char_len_field_names, /* field_names lenghts */
-		  int_f *max_char_size_field_names, /* char len of fields */
+                  size_t_f *char_len_field_names, /* field_names lenghts */
+                  size_t_f *max_char_size_field_names, /* char len of fields */
                   char *field_names)            /* field_names */
 {
     char *c_name = NULL;
@@ -64,7 +64,7 @@ nh5tbmake_table_c(int_f *namelen1,
     char *tmp = NULL, *tmp_p;
     int_f ret_value = 0;
 
-    num_elem = *nfields;
+    num_elem = (hsize_t)*nfields;
 
     /*
      * convert FORTRAN name to C name
@@ -79,7 +79,7 @@ nh5tbmake_table_c(int_f *namelen1,
         HGOTO_DONE(FAIL)
 
     for(i = 0; i < num_elem; i++) {
-        c_field_offset[i] = field_offset[i];
+      c_field_offset[i] = (size_t)field_offset[i];
         c_field_types[i] = field_types[i];
     } /* end for */
 
@@ -100,7 +100,7 @@ nh5tbmake_table_c(int_f *namelen1,
         if(NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
             HGOTO_DONE(FAIL)
         HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
-	c_field_names[i][char_len_field_names[i]] = '\0';
+        c_field_names[i][char_len_field_names[i]] = '\0';
 
         tmp_p = tmp_p + *max_char_size_field_names;
     } /* end for */
@@ -123,7 +123,7 @@ done:
             if(c_field_names[i])
                 HDfree(c_field_names[i]);
         } /* end for */
-	HDfree(c_field_names);
+        HDfree(c_field_names);
     } /* end if */
     if(tmp)
         HDfree(tmp);
@@ -152,9 +152,9 @@ done:
 */
 int_f
 nh5tbwrite_field_name_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
-                        int_f *namelen1,
+                        size_t_f *namelen1,
                         _fcd field_name,
                         hsize_t_f *start,
                         hsize_t_f *nrecords,
@@ -192,9 +192,9 @@ done:
 
 int_f
 nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
-                            int_f *namelen1,
+                            size_t_f *namelen1,
                             _fcd field_name,
                             hsize_t_f *start,
                             hsize_t_f *nrecords,
@@ -207,9 +207,9 @@ nh5tbwrite_field_name_int_c(hid_t_f *loc_id,
 
 int_f
 nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -222,9 +222,9 @@ nh5tbwrite_field_name_fl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -237,9 +237,9 @@ nh5tbwrite_field_name_dl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -267,9 +267,9 @@ nh5tbwrite_field_name_st_c(hid_t_f *loc_id,
 */
 int_f
 nh5tbread_field_name_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hsize_t_f *start,
                        hsize_t_f *nrecords,
@@ -307,9 +307,9 @@ done:
 
 int_f
 nh5tbread_field_name_int_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
-                           int_f *namelen1,
+                           size_t_f *namelen1,
                            _fcd field_name,
                            hsize_t_f *start,
                            hsize_t_f *nrecords,
@@ -322,9 +322,9 @@ nh5tbread_field_name_int_c(hid_t_f *loc_id,
 
 int_f
 nh5tbread_field_name_fl_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *namelen1,
+                          size_t_f *namelen1,
                           _fcd field_name,
                           hsize_t_f *start,
                           hsize_t_f *nrecords,
@@ -337,9 +337,9 @@ nh5tbread_field_name_fl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbread_field_name_dl_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *namelen1,
+                          size_t_f *namelen1,
                           _fcd field_name,
                           hsize_t_f *start,
                           hsize_t_f *nrecords,
@@ -352,9 +352,9 @@ nh5tbread_field_name_dl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbread_field_name_st_c(hid_t_f *loc_id,
-                          int_f *namelen,
+                          size_t_f *namelen,
                           _fcd name,
-                          int_f *namelen1,
+                          size_t_f *namelen1,
                           _fcd field_name,
                           hsize_t_f *start,
                           hsize_t_f *nrecords,
@@ -382,7 +382,7 @@ nh5tbread_field_name_st_c(hid_t_f *loc_id,
 */
 int_f
 nh5tbwrite_field_index_c(hid_t_f *loc_id,
-                         int_f *namelen,
+                         size_t_f *namelen,
                          _fcd name,
                          int_f *field_index,
                          hsize_t_f *start,
@@ -418,7 +418,7 @@ done:
 
 int_f
 nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
-                             int_f *namelen,
+                             size_t_f *namelen,
                              _fcd name,
                              int_f *field_index,
                              hsize_t_f *start,
@@ -432,7 +432,7 @@ nh5tbwrite_field_index_int_c(hid_t_f *loc_id,
 
 int_f
 nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -446,7 +446,7 @@ nh5tbwrite_field_index_fl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -460,7 +460,7 @@ nh5tbwrite_field_index_dl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -489,7 +489,7 @@ nh5tbwrite_field_index_st_c(hid_t_f *loc_id,
 */
 int_f
 nh5tbread_field_index_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
                         int_f *field_index,
                         hsize_t_f *start,
@@ -524,7 +524,7 @@ done:
 
 int_f
 nh5tbread_field_index_int_c(hid_t_f *loc_id,
-                            int_f *namelen,
+                            size_t_f *namelen,
                             _fcd name,
                             int_f *field_index,
                             hsize_t_f *start,
@@ -538,7 +538,7 @@ nh5tbread_field_index_int_c(hid_t_f *loc_id,
 
 int_f
 nh5tbread_field_index_fl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *field_index,
                            hsize_t_f *start,
@@ -552,7 +552,7 @@ nh5tbread_field_index_fl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbread_field_index_dl_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *field_index,
                            hsize_t_f *start,
@@ -566,7 +566,7 @@ nh5tbread_field_index_dl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbread_field_index_st_c(hid_t_f *loc_id,
-                           int_f *namelen,
+                           size_t_f *namelen,
                            _fcd name,
                            int_f *field_index,
                            hsize_t_f *start,
@@ -595,9 +595,9 @@ nh5tbread_field_index_st_c(hid_t_f *loc_id,
 */
 int_f
 nh5tbinsert_field_c(hid_t_f *loc_id,
-                    int_f *namelen,
+                    size_t_f *namelen,
                     _fcd name,
-                    int_f *namelen1,
+                    size_t_f *namelen1,
                     _fcd field_name,
                     hid_t_f *field_type,
                     int_f *position,
@@ -633,9 +633,9 @@ done:
 
 int_f
 nh5tbinsert_field_int_c(hid_t_f *loc_id,
-                        int_f *namelen,
+                        size_t_f *namelen,
                         _fcd name,
-                        int_f *namelen1,
+                        size_t_f *namelen1,
                         _fcd field_name,
                         hid_t_f *field_type,
                         int_f *position,
@@ -647,9 +647,9 @@ nh5tbinsert_field_int_c(hid_t_f *loc_id,
 
 int_f
 nh5tbinsert_field_fl_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hid_t_f *field_type,
                        int_f *position,
@@ -661,9 +661,9 @@ nh5tbinsert_field_fl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbinsert_field_dl_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hid_t_f *field_type,
                        int_f *position,
@@ -675,9 +675,9 @@ nh5tbinsert_field_dl_c(hid_t_f *loc_id,
 
 int_f
 nh5tbinsert_field_st_c(hid_t_f *loc_id,
-                       int_f *namelen,
+                       size_t_f *namelen,
                        _fcd name,
-                       int_f *namelen1,
+                       size_t_f *namelen1,
                        _fcd field_name,
                        hid_t_f *field_type,
                        int_f *position,
@@ -704,9 +704,9 @@ nh5tbinsert_field_st_c(hid_t_f *loc_id,
 */
 int_f
 nh5tbdelete_field_c(hid_t_f *loc_id,
-                    int_f *namelen,
+                    size_t_f *namelen,
                     _fcd name,
-                    int_f *namelen1,
+                    size_t_f *namelen1,
                     _fcd field_name)
 {
     char   *c_name = NULL;
@@ -753,7 +753,7 @@ done:
 */
 int_f
 nh5tbget_table_info_c(hid_t_f *loc_id,
-                      int_f *namelen,
+                      size_t_f *namelen,
                       _fcd name,
                       hsize_t_f *nfields,
                       hsize_t_f *nrecords)
@@ -803,16 +803,16 @@ done:
 */
 int_f
 nh5tbget_field_info_c(hid_t_f *loc_id,
-                      int_f *namelen,
+                      size_t_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 */
-		      int_f *lenmax,         /* character len max */
+                      size_t_f *namelen2,       /* field_names lenghts */
+                      size_t_f *lenmax,         /* character len max */
                       _fcd field_names,      /* field_names */
-                      int_f *maxlen_out)
+                      size_t_f *maxlen_out)
 
 {
     char   *c_name = NULL;
@@ -867,9 +867,9 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
          size_t field_name_len = HDstrlen(c_field_names[i]);
 
          HDmemcpy(tmp_p, c_field_names[i], field_name_len);
-	 namelen2[i] = (int_f)field_name_len;
-	 length = MAX(length, strlen((c_field_names[i])));
-	 tmp_p = tmp_p + c_lenmax;
+         namelen2[i] = (size_t_f)field_name_len;
+         length = MAX(length, strlen((c_field_names[i])));
+         tmp_p = tmp_p + c_lenmax;
     } /* end for */
 
     HD5packFstring(tmp, _fcdtocp(field_names), (size_t)( c_lenmax* c_nfields));
@@ -880,7 +880,7 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
         field_offsets[i] = (size_t_f)c_field_offsets[i];
     } /* end for */
 
-    *maxlen_out = (int_f)length; 
+    *maxlen_out = (size_t_f)length; 
 
 done:
     if(c_name)
diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
index 8d31a93..5846f49 100644
--- a/hl/fortran/src/H5TBff.f90
+++ b/hl/fortran/src/H5TBff.f90
@@ -93,14 +93,12 @@ SUBROUTINE h5tbmake_table_f(table_title,&
                             errcode )
 
  IMPLICIT NONE
-
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbmake_table_f
 !DEC$endif
 !
-
  CHARACTER(LEN=*), INTENT(in) :: table_title                      ! name of the dataset
  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
@@ -112,12 +110,12 @@ SUBROUTINE h5tbmake_table_f(table_title,&
  INTEGER(hid_t),   DIMENSION(1:nfields), INTENT(in) :: field_types  ! field types
  INTEGER(hsize_t), INTENT(in) :: chunk_size                       ! chunk size
  INTEGER,          INTENT(in) :: compress                         ! compress
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
  INTEGER :: errcode                                               ! error code
- INTEGER, DIMENSION(1:nfields) :: char_len_field_names            ! field name lengths
- INTEGER :: max_char_size_field_names                             ! character len of field names
- INTEGER :: i                                                     ! general purpose integer
+ INTEGER(size_t), DIMENSION(1:nfields) :: char_len_field_names    ! field name lengths
+ INTEGER(size_t) :: max_char_size_field_names                     ! character len of field names
+ INTEGER(hsize_t) :: i                                            ! general purpose integer
 
 
  INTERFACE
@@ -155,10 +153,10 @@ SUBROUTINE h5tbmake_table_f(table_title,&
       INTEGER(hid_t),   DIMENSION(nfields), INTENT(in) :: field_types  ! field types
       INTEGER(hsize_t), INTENT(in) :: chunk_size                       ! chunk size
       INTEGER,          INTENT(in) :: compress                         ! compress
-      INTEGER :: namelen                                               ! name length
-      INTEGER :: namelen1                                              ! name length
-      INTEGER, DIMENSION(nfields) :: char_len_field_names              ! field name's lengths
-      INTEGER :: max_char_size_field_names                             ! character len of field names
+      INTEGER(size_t) :: namelen                                       ! name length
+      INTEGER(size_t) :: namelen1                                      ! name length
+      INTEGER(size_t), DIMENSION(nfields) :: char_len_field_names      ! field name's lengths
+      INTEGER(size_t) :: max_char_size_field_names                     ! character len of field names
     END FUNCTION h5tbmake_table_c
  END INTERFACE
  
@@ -232,8 +230,8 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -254,8 +252,8 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbwrite_field_name_int_c
  END INTERFACE
 
@@ -308,8 +306,8 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -330,8 +328,8 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbwrite_field_name_fl_c
  END INTERFACE
 
@@ -386,8 +384,8 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -408,8 +406,8 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbwrite_field_name_dl_c
  END INTERFACE
 
@@ -462,8 +460,8 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -484,8 +482,8 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbwrite_field_name_st_c
  END INTERFACE
 
@@ -539,8 +537,8 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_name_int_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -561,8 +559,8 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbread_field_name_int_c
  END INTERFACE
 
@@ -615,8 +613,8 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_name_fl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -637,8 +635,8 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbread_field_name_fl_c
  END INTERFACE
 
@@ -691,8 +689,8 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_name_dl_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -713,8 +711,8 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbread_field_name_dl_c
  END INTERFACE
 
@@ -767,8 +765,8 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_name_st_c(loc_id,namelen,dset_name,namelen1,field_name,&
@@ -789,8 +787,8 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length
   END FUNCTION h5tbread_field_name_st_c
  END INTERFACE
 
@@ -844,7 +842,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_index_int_c(loc_id,namelen,dset_name,field_index,&
@@ -864,7 +862,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbwrite_field_index_int_c
  END INTERFACE
 
@@ -916,7 +914,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
@@ -936,7 +934,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbwrite_field_index_fl_c
  END INTERFACE
 
@@ -990,7 +988,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
@@ -1010,7 +1008,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbwrite_field_index_dl_c
  END INTERFACE
 
@@ -1062,7 +1060,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbwrite_field_index_st_c(loc_id,namelen,dset_name,field_index,&
@@ -1082,7 +1080,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbwrite_field_index_st_c
  END INTERFACE
 
@@ -1135,7 +1133,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_index_int_c(loc_id,namelen,dset_name,field_index,&
@@ -1155,7 +1153,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbread_field_index_int_c
  END INTERFACE
 
@@ -1207,7 +1205,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_index_fl_c(loc_id,namelen,dset_name,field_index,&
@@ -1227,7 +1225,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbread_field_index_fl_c
  END INTERFACE
 
@@ -1279,7 +1277,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_index_dl_c(loc_id,namelen,dset_name,field_index,&
@@ -1299,7 +1297,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbread_field_index_dl_c
  END INTERFACE
 
@@ -1351,7 +1349,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,&
  INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
  INTEGER :: errcode                                               ! error code
- INTEGER :: namelen                                               ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbread_field_index_st_c(loc_id,namelen,dset_name,field_index,&
@@ -1371,7 +1369,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,&
   INTEGER(size_t),  INTENT(in) :: type_size                        ! type size
   CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
   INTEGER :: errcode                                               ! error code
-  INTEGER :: namelen                                               ! name length
+  INTEGER(size_t) :: namelen                                       ! name length
   END FUNCTION h5tbread_field_index_st_c
  END INTERFACE
 
@@ -1420,8 +1418,8 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,&
  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
  INTEGER, INTENT(in) :: field_index                               ! field_index
  INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
  INTEGER :: errcode                                               ! error code
 
 
@@ -1442,8 +1440,8 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,&
   INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
   INTEGER, INTENT(in) :: field_index                               ! field_index
   INTEGER, INTENT(in), DIMENSION(*) :: buf                         ! data buffer
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length length
   END FUNCTION h5tbinsert_field_int_c
  END INTERFACE
 
@@ -1494,8 +1492,8 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,&
  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
  INTEGER, INTENT(in) :: field_index                               ! field_index
  REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
  INTEGER :: errcode                                               ! error code
 
 
@@ -1516,8 +1514,8 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,&
   INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
   INTEGER, INTENT(in) :: field_index                               ! field_index
   REAL, INTENT(in), DIMENSION(*) :: buf                            ! data buffer
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length length
   END FUNCTION h5tbinsert_field_fl_c
  END INTERFACE
 
@@ -1568,8 +1566,8 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,&
  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
  INTEGER, INTENT(in) :: field_index                               ! field_index
  DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
  INTEGER :: errcode                                               ! error code
 
 
@@ -1590,8 +1588,8 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,&
   INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
   INTEGER, INTENT(in) :: field_index                               ! field_index
   DOUBLE PRECISION, INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length length
   END FUNCTION h5tbinsert_field_dl_c
  END INTERFACE
 
@@ -1643,8 +1641,8 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,&
  INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
  INTEGER, INTENT(in) :: field_index                               ! field_index
  CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
  INTEGER :: errcode                                               ! error code
 
 
@@ -1665,8 +1663,8 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,&
   INTEGER(hid_t), INTENT(in)   :: field_type                       ! field type
   INTEGER, INTENT(in) :: field_index                               ! field_index
   CHARACTER(LEN=*), INTENT(in), DIMENSION(*) :: buf                ! data buffer
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length length
   END FUNCTION h5tbinsert_field_st_c
  END INTERFACE
 
@@ -1712,8 +1710,8 @@ SUBROUTINE h5tbdelete_field_f(loc_id,&
  INTEGER(hid_t),   INTENT(in) :: loc_id                           ! file or group identifier
  CHARACTER(LEN=*), INTENT(in) :: dset_name                        ! name of the dataset
  CHARACTER(LEN=*), INTENT(in) :: field_name                       ! name of the field
- INTEGER :: namelen                                               ! name length
- INTEGER :: namelen1                                              ! name length
+ INTEGER(size_t) :: namelen                                       ! name length
+ INTEGER(size_t) :: namelen1                                      ! name length
  INTEGER :: errcode                                               ! error code
 
 
@@ -1730,8 +1728,8 @@ SUBROUTINE h5tbdelete_field_f(loc_id,&
   INTEGER(HID_T),   INTENT(IN) :: loc_id                           ! file or group identifier
   CHARACTER(LEN=*), INTENT(IN) :: dset_name                        ! name of the dataset
   CHARACTER(LEN=*), INTENT(IN) :: field_name                       ! name of the field
-  INTEGER :: namelen                                               ! name length
-  INTEGER :: namelen1                                              ! name length length
+  INTEGER(size_t) :: namelen                                       ! name length
+  INTEGER(size_t) :: namelen1                                      ! name length length
   END FUNCTION h5tbdelete_field_c
  END INTERFACE
 
@@ -1781,7 +1779,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,&
  INTEGER(hsize_t), INTENT(inout):: nfields          ! nfields
  INTEGER(hsize_t), INTENT(inout):: nrecords         ! nrecords
  INTEGER :: errcode                                 ! error code
- INTEGER :: namelen                                 ! name length
+ INTEGER(size_t) :: namelen                         ! name length
 
  INTERFACE
   INTEGER FUNCTION h5tbget_table_info_c(loc_id,namelen,dset_name,nfields,nrecords)
@@ -1795,7 +1793,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,&
   CHARACTER(LEN=*), INTENT(in) :: dset_name          ! name of the dataset
   INTEGER(hsize_t), INTENT(inout):: nfields          ! nfields
   INTEGER(hsize_t), INTENT(inout):: nrecords         ! nrecords
-  INTEGER :: namelen                                 ! name length
+  INTEGER(size_t) :: namelen                         ! name length
   END FUNCTION h5tbget_table_info_c
  END INTERFACE
 
@@ -1819,7 +1817,7 @@ END SUBROUTINE h5tbget_table_info_f
 ! Comments:
 !
 ! Modifications: 
-!  Added optional parameter for returning the maximum character lenght
+!  Added optional parameter for returning the maximum character length
 !  in the field name array. March 3, 2011 
 !
 !-------------------------------------------------------------------------
@@ -1828,9 +1826,9 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
                                 dset_name,&
                                 nfields,&
                                 field_names,&
-				field_sizes,&
-				field_offsets,&
-				type_size,&
+                                field_sizes,&
+                                field_offsets,&
+                                type_size,&
                                 errcode, maxlen_out )
 
   IMPLICIT NONE
@@ -1849,11 +1847,11 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
   INTEGER(size_t),  INTENT(inout):: type_size                           ! type size
   INTEGER :: errcode                                                    ! error code
   INTEGER, OPTIONAL :: maxlen_out                                       ! maximum character len of the field names
-  INTEGER :: namelen                                                    ! name length
-  INTEGER, DIMENSION(nfields) :: namelen2                               ! name lengths
-  INTEGER :: i                                                          ! general purpose integer
-  INTEGER :: maxlen
-  INTEGER :: c_maxlen_out
+  INTEGER(size_t) :: namelen                                            ! name length
+  INTEGER(size_t), DIMENSION(nfields) :: namelen2                       ! name lengths
+  INTEGER(hsize_t) :: i                                                          ! general purpose integer
+  INTEGER(size_t) :: maxlen
+  INTEGER(size_t) :: c_maxlen_out
 
   INTERFACE
      INTEGER FUNCTION h5tbget_field_info_c(loc_id,namelen,dset_name,nfields,&
@@ -1872,10 +1870,10 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
        INTEGER(size_t),  DIMENSION(1:nfields), INTENT(inout) :: field_sizes   ! field sizes
        INTEGER(size_t),  DIMENSION(1:nfields), INTENT(inout) :: field_offsets ! field offsets
        INTEGER(size_t),  INTENT(inout):: type_size                            ! type size
-       INTEGER :: namelen                                                     ! name length
-       INTEGER :: maxlen                                                      ! maxiumum length of input field names
-       INTEGER, DIMENSION(1:nfields) :: namelen2                              ! name lengths
-       INTEGER :: c_maxlen_out                  ! maximum character length of a field array element 
+       INTEGER(size_t) :: namelen                                             ! name length
+       INTEGER(size_t) :: maxlen                                              ! maxiumum length of input field names
+       INTEGER(size_t), DIMENSION(1:nfields) :: namelen2                      ! name lengths
+       INTEGER(size_t) :: c_maxlen_out                  ! maximum character length of a field array element 
      END FUNCTION h5tbget_field_info_c
   END INTERFACE
 
diff --git a/hl/fortran/test/tstds.f90 b/hl/fortran/test/tstds.f90
index c73e1c4..cbf6c38 100644
--- a/hl/fortran/test/tstds.f90
+++ b/hl/fortran/test/tstds.f90
@@ -91,7 +91,7 @@ SUBROUTINE test_testds(err)
   !-------------------------------------------------------------------------
   ! attach the DS_1_NAME dimension scale to DSET_NAME at dimension 1
   !-------------------------------------------------------------------------
- 
+
   CALL test_begin(' Test Attaching Dimension Scale         ')
 
   ! get the dataset id for DSET_NAME
diff --git a/hl/fortran/test/tstimage.f90 b/hl/fortran/test/tstimage.f90
index 3794bbf..0bff6b2 100644
--- a/hl/fortran/test/tstimage.f90
+++ b/hl/fortran/test/tstimage.f90
@@ -111,13 +111,11 @@ end do
 ! Initialize FORTRAN predefined datatypes.
 !
 call h5open_f(errcode)
-
 !
 ! Create a new file using default properties.
 !
 call h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, errcode)
 
-
 !-------------------------------------------------------------------------
 ! indexed image
 !-------------------------------------------------------------------------
diff --git a/hl/fortran/test/tstlite.f90 b/hl/fortran/test/tstlite.f90
index 0b5a138..d035b89 100644
--- a/hl/fortran/test/tstlite.f90
+++ b/hl/fortran/test/tstlite.f90
@@ -63,7 +63,6 @@ INTEGER        :: i                                  ! general purpose integer
 
 CALL test_begin(' Make/Read datasets (1D)        ')
 
-
 !
 ! Initialize the data array.
 !
@@ -186,8 +185,8 @@ USE HDF5 ! module of HDF5 library
 IMPLICIT NONE
 
 
-INTEGER, PARAMETER :: DIM1 = 4;                             ! columns
-INTEGER, PARAMETER :: DIM2 = 6;                             ! rows
+INTEGER(HSIZE_T), PARAMETER :: DIM1 = 4;             ! columns
+INTEGER(HSIZE_T), PARAMETER :: DIM2 = 6;             ! rows
 CHARACTER(len=9), PARAMETER :: filename = "dsetf2.h5"! File name
 CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1"   ! Dataset name
 CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2"   ! Dataset name
@@ -205,7 +204,7 @@ REAL, DIMENSION(DIM1,DIM2)    :: buf3r               ! Data buffer
 DOUBLE PRECISION, DIMENSION(DIM1,DIM2) :: buf4       ! Data buffer
 DOUBLE PRECISION, DIMENSION(DIM1,DIM2) :: buf4r      ! Data buffer
 INTEGER        :: errcode                            ! Error flag
-INTEGER        :: i, j, n                            ! general purpose integers
+INTEGER(HSIZE_T) :: i, j, n                            ! general purpose integers
 
 CALL test_begin(' Make/Read datasets (2D)        ')
 
@@ -215,15 +214,15 @@ CALL test_begin(' Make/Read datasets (2D)        ')
 !
 n=1
 DO i = 1, DIM1*DIM2
-   buf(i) = n;
+   buf(i) = INT(n)
    n = n + 1
 END DO
 
 DO i = 1, dims(1)
  DO j = 1, dims(2)
-  buf2(i,j) = (i-1)*dims(2) + j;
-  buf3(i,j) = (i-1)*dims(2) + j;
-  buf4(i,j) = (i-1)*dims(2) + j;
+  buf2(i,j) = INT((i-1)*dims(2) + j)
+  buf3(i,j) = INT((i-1)*dims(2) + j)
+  buf4(i,j) = INT((i-1)*dims(2) + j)
  END DO
 END DO
 
@@ -373,9 +372,9 @@ USE HDF5 ! module of HDF5 library
 
 IMPLICIT NONE
 
-INTEGER, PARAMETER :: DIM1 = 6;                             ! columns
-INTEGER, PARAMETER :: DIM2 = 4;                             ! rows
-INTEGER, PARAMETER :: DIM3 = 2;                             ! layers
+INTEGER, PARAMETER :: DIM1 = 6                             ! columns
+INTEGER, PARAMETER :: DIM2 = 4                             ! rows
+INTEGER, PARAMETER :: DIM3 = 2                             ! layers
 CHARACTER(len=9), PARAMETER :: filename = "dsetf3.h5"       ! File name
 CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1"          ! Dataset name
 CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2"          ! Dataset name
@@ -394,7 +393,7 @@ DOUBLE PRECISION, DIMENSION(DIM1,DIM2,DIM3) :: buf4         ! Data buffer
 DOUBLE PRECISION, DIMENSION(DIM1,DIM2,DIM3) :: buf4r        ! Data buffer
 INTEGER        :: rank = 3                                  ! Dataset rank
 INTEGER        :: errcode                                   ! Error flag
-INTEGER        :: i, j, k, n                                ! general purpose integers
+INTEGER(HSIZE_T) :: i, j, k, n                                ! general purpose integers
 INTEGER          :: type_class
 INTEGER(SIZE_T)  :: type_size
 
@@ -406,20 +405,20 @@ CALL test_begin(' Make/Read datasets (3D)        ')
 !
 n=1
 DO i = 1, DIM1*DIM2*DIM3
-   buf(i) = n;
+   buf(i) = INT(n)
    n = n + 1
 END DO
 
 n = 1
 DO i = 1, dims(1)
- DO j = 1, dims(2)
- DO k = 1, dims(3)
-  buf2(i,j,k) = n;
-  buf3(i,j,k) = n;
-  buf4(i,j,k) = n;
-  n = n + 1
- END DO
- END DO
+   DO j = 1, dims(2)
+      DO k = 1, dims(3)
+         buf2(i,j,k) = INT(n)
+         buf3(i,j,k) = INT(n)
+         buf4(i,j,k) = INT(n)
+         n = n + 1
+      END DO
+   END DO
 END DO
 
 !
@@ -625,7 +624,7 @@ SUBROUTINE test_datasetND(rank)
   DOUBLE PRECISION, ALLOCATABLE, DIMENSION(:,:,:,:,:,:,:) :: dbuf_7       ! Data buffer
   DOUBLE PRECISION, ALLOCATABLE, DIMENSION(:,:,:,:,:,:,:) :: dbufr_7      ! Data buffer
   INTEGER        :: errcode                                   ! Error flag
-  INTEGER        :: i, j, k, l, m, n, o, nn                   ! general purpose integers
+  INTEGER(HSIZE_T)        :: i, j, k, l, m, n, o, nn                   ! general purpose integers
   INTEGER          :: type_class
   INTEGER(SIZE_T)  :: type_size
   CHARACTER(LEN=1) :: ichr1
@@ -651,9 +650,9 @@ SUBROUTINE test_datasetND(rank)
         DO j = 1, DIM2
            DO k = 1, DIM3
               DO l = 1, DIM4
-                 ibuf_4(i,j,k,l) = nn
-                 rbuf_4(i,j,k,l) = nn
-                 dbuf_4(i,j,k,l) = nn
+                 ibuf_4(i,j,k,l) = INT(nn)
+                 rbuf_4(i,j,k,l) = INT(nn)
+                 dbuf_4(i,j,k,l) = INT(nn)
                  nn = nn + 1
               END DO
            END DO
@@ -677,9 +676,9 @@ SUBROUTINE test_datasetND(rank)
            DO k = 1, DIM3
               DO l = 1, DIM4
                  DO m = 1, DIM5
-                    ibuf_5(i,j,k,l,m) = nn
-                    rbuf_5(i,j,k,l,m) = nn
-                    dbuf_5(i,j,k,l,m) = nn
+                    ibuf_5(i,j,k,l,m) = INT(nn)
+                    rbuf_5(i,j,k,l,m) = INT(nn)
+                    dbuf_5(i,j,k,l,m) = INT(nn)
                     nn = nn + 1
                  END DO
               END DO
@@ -705,9 +704,9 @@ SUBROUTINE test_datasetND(rank)
               DO l = 1, DIM4
                  DO m = 1, DIM5
                     DO n = 1, DIM6
-                       ibuf_6(i,j,k,l,m,n) = nn
-                       rbuf_6(i,j,k,l,m,n) = nn
-                       dbuf_6(i,j,k,l,m,n) = nn
+                       ibuf_6(i,j,k,l,m,n) = INT(nn)
+                       rbuf_6(i,j,k,l,m,n) = INT(nn)
+                       dbuf_6(i,j,k,l,m,n) = INT(nn)
                        nn = nn + 1
                     END DO
                  END DO
@@ -735,9 +734,9 @@ SUBROUTINE test_datasetND(rank)
                  DO m = 1, DIM5
                     DO n = 1, DIM6
                        DO o = 1, DIM7
-                          ibuf_7(i,j,k,l,m,n,o) = nn
-                          rbuf_7(i,j,k,l,m,n,o) = nn
-                          dbuf_7(i,j,k,l,m,n,o) = nn
+                          ibuf_7(i,j,k,l,m,n,o) = INT(nn)
+                          rbuf_7(i,j,k,l,m,n,o) = INT(nn)
+                          dbuf_7(i,j,k,l,m,n,o) = INT(nn)
                           nn = nn + 1
                        END DO
                     END DO
@@ -1045,7 +1044,7 @@ SUBROUTINE test_datasets()
   CHARACTER(len=9), PARAMETER :: filename = "dsetf4.h5"! File name
   INTEGER(HID_T) :: file_id                            ! File identifier
   INTEGER        :: errcode                            ! Error flag
-  INTEGER, PARAMETER :: DIM1 = 10;                     ! Dimension of array
+  INTEGER, PARAMETER :: DIM1 = 10                     ! Dimension of array
   CHARACTER(LEN=5), PARAMETER :: dsetname1 = "dset1"   ! Dataset name
   CHARACTER(LEN=5), PARAMETER :: dsetname2 = "dset2"   ! Dataset name
   CHARACTER(LEN=5), PARAMETER :: dsetname3 = "dset3"   ! Dataset name
@@ -1086,10 +1085,10 @@ SUBROUTINE test_datasets()
   !
   n = 1
   DO i = 1, DIM1
-     buf2(i) = n;
-     buf3(i) = n;
-     buf4(i) = n;
-     n = n + 1;
+     buf2(i) = n
+     buf3(i) = n
+     buf4(i) = n
+     n = n + 1
   END DO
 
   !-------------------------------------------------------------------------
@@ -1344,8 +1343,8 @@ SUBROUTINE test_attributes()
   CHARACTER(len=9), PARAMETER :: filename = "dsetf5.h5"! File name
   CHARACTER(len=9), PARAMETER :: filename1 ="tattr.h5" ! C written attribute file
   INTEGER(HID_T) :: file_id                            ! File identifier
-  INTEGER(HID_T) :: file_id1
-  INTEGER, PARAMETER :: DIM1 = 10;                     ! Dimension of array
+!  INTEGER(HID_T) :: file_id1
+  INTEGER, PARAMETER :: DIM1 = 10                     ! Dimension of array
   CHARACTER(LEN=5), PARAMETER :: attrname1 = "attr1"   ! Attribute name
   CHARACTER(LEN=5), PARAMETER :: attrname2 = "attr2"   ! Attribute name
   CHARACTER(LEN=5), PARAMETER :: attrname3 = "attr3"   ! Attribute name
@@ -1355,8 +1354,8 @@ SUBROUTINE test_attributes()
   CHARACTER(LEN=16), PARAMETER :: buf_c = "string attribute"
   CHARACTER(LEN=8)                  :: bufr1           ! Data buffer
   CHARACTER(LEN=10)                 :: bufr1_lg        ! Data buffer
-  CHARACTER(LEN=16)                 :: bufr_c          ! Data buffer
-  CHARACTER(LEN=18)                 :: bufr_c_lg       ! Data buffer
+!  CHARACTER(LEN=16)                 :: bufr_c          ! Data buffer
+!  CHARACTER(LEN=18)                 :: bufr_c_lg       ! Data buffer
   INTEGER, DIMENSION(DIM1)          :: buf2            ! Data buffer
   INTEGER, DIMENSION(DIM1)          :: bufr2           ! Data buffer
   REAL, DIMENSION(DIM1)             :: buf3            ! Data buffer
@@ -1395,10 +1394,10 @@ SUBROUTINE test_attributes()
   size = DIM1
   n = 1
   DO i = 1, DIM1
-     buf2(i) = n;
-     buf3(i) = n;
-     buf4(i) = n;
-     n = n + 1;
+     buf2(i) = n
+     buf3(i) = n
+     buf4(i) = n
+     n = n + 1
   END DO
 
 
@@ -1443,7 +1442,6 @@ SUBROUTINE test_attributes()
   ! write attribute.
   !
   CALL h5ltset_attribute_float_f(file_id,dsetname1,attrname3,buf3,size,errcode)
-
   !
   ! read attribute.
   !
@@ -1460,7 +1458,6 @@ SUBROUTINE test_attributes()
      ENDIF
   END DO
 
-
   CALL passed()
 
   !-------------------------------------------------------------------------
@@ -1468,8 +1465,7 @@ SUBROUTINE test_attributes()
   !-------------------------------------------------------------------------
 
   CALL test_begin(' Set/Get attributes double      ')
-
-
+  
   !
   ! write attribute.
   !
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index f4b754a..939a99f 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -144,7 +144,8 @@ herr_t H5DSattach_scale(hid_t did,
     hid_t      dsid_j;       /* DS dataset ID in DIMENSION_LIST */
     H5O_info_t oi1, oi2;
     H5I_type_t it1, it2;
-    int        i, len;
+    int        i;
+    size_t len;
     int        found_ds=0;
     htri_t     is_scale;
 
@@ -242,7 +243,7 @@ herr_t H5DSattach_scale(hid_t did,
     if (has_dimlist == 0)
     {
 
-        dims[0] = rank;
+      dims[0] = (hsize_t)rank;
 
         /* space for the attribute */
         if((sid = H5Screate_simple(1, dims, NULL)) < 0)
@@ -477,7 +478,7 @@ herr_t H5DSattach_scale(hid_t did,
         dsbuf[nelmts - 1] = dsl;
 
         /* create a new data space for the new references array */
-        dims[0] = nelmts;
+        dims[0] = (hsize_t)nelmts;
 
         if((sid = H5Screate_simple(1, dims, NULL)) < 0)
             goto out;
@@ -798,7 +799,7 @@ herr_t H5DSdetach_scale(hid_t did,
 
     for(ii=0; ii<nelmts; ii++) {
         /* First check if we have the same dimension index */
-        if((int)idx == dsbuf[ii].dim_idx) {
+      if(idx == dsbuf[ii].dim_idx) {
             /* get the reference to the dataset */
             ref = dsbuf[ii].ref;
 
@@ -853,7 +854,7 @@ herr_t H5DSdetach_scale(hid_t did,
     if(nelmts)
     {
         /* create a new data space for the new references array */
-        dims[0] = nelmts;
+      dims[0] = (hsize_t)nelmts;
 
         if((sid = H5Screate_simple(1, dims, NULL)) < 0)
             goto out;
@@ -1153,7 +1154,7 @@ htri_t H5DSis_attached(hid_t did,
                     goto out;
 
                 /* same object */
-                if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && (int)idx==dsbuf[i].dim_idx)
+                if(oi3.fileno == oi4.fileno && oi3.addr == oi4.addr && idx==dsbuf[i].dim_idx)
                     found_dset=1;
 
                 /* close the dereferenced dataset */
@@ -1478,7 +1479,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label)
 
     if (has_labels == 0)
     {
-        dims[0] = rank;
+        dims[0] = (hsize_t)rank;
 
         /* space for the attribute */
         if ((sid = H5Screate_simple(1, dims, NULL)) < 0)
diff --git a/hl/src/H5DSprivate.h b/hl/src/H5DSprivate.h
index 61c0a1c..39c3e74 100644
--- a/hl/src/H5DSprivate.h
+++ b/hl/src/H5DSprivate.h
@@ -28,7 +28,7 @@
 /* attribute type of a DS dataset */
 typedef struct ds_list_t {
  hobj_ref_t ref;     /* object reference  */
- int        dim_idx; /* dimension index of the dataset */
+ unsigned int dim_idx; /* dimension index of the dataset */
 } ds_list_t;
 
 
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index aeda6ab..6fa548d 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -628,9 +628,9 @@ herr_t H5IMlink_palette( hid_t loc_id,
 
         n_refs = H5Sget_simple_extent_npoints(asid);
 
-        dim_ref = n_refs + 1;
+        dim_ref = (hsize_t)n_refs + 1;
 
-        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref );
+        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
 
         if ( H5Aread( aid, atid, refbuf ) < 0)
             goto out;
@@ -949,9 +949,9 @@ herr_t H5IMget_palette_info( hid_t loc_id,
 
         n_refs = H5Sget_simple_extent_npoints(asid);
 
-        dim_ref = n_refs;
+        dim_ref = (hsize_t)n_refs;
 
-        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref );
+        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
 
         if ( H5Aread( aid, atid, refbuf ) < 0)
             goto out;
@@ -1067,9 +1067,9 @@ herr_t H5IMget_palette( hid_t loc_id,
 
         n_refs = H5Sget_simple_extent_npoints(asid);
 
-        dim_ref = n_refs;
+        dim_ref = (hsize_t)n_refs;
 
-        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (int)dim_ref );
+        refbuf = (hobj_ref_t*)HDmalloc( sizeof(hobj_ref_t) * (size_t)dim_ref );
 
         if ( H5Aread( aid, atid, refbuf ) < 0)
             goto out;
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index 9d6123b..8541cfe 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -2398,7 +2398,7 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
     for (i = 0; i < nmembs; i++) {
         if((name[i] = H5Tget_member_name(type, (unsigned)i))==NULL)
             goto out;
-        if(H5Tget_member_value(type, (unsigned)i, value + i * super_size) < 0)
+        if(H5Tget_member_value(type, (unsigned)i, value + (size_t)i * super_size) < 0)
             goto out;
     }
 
@@ -2426,7 +2426,7 @@ print_enum(hid_t type, char* str, size_t *str_len, hbool_t no_ubuf, size_t indt)
 
         /*On SGI Altix(cobalt), wrong values were printed out with "value+i*dst_size"
          *strangely, unless use another pointer "copy".*/
-        copy = value+i*dst_size;
+        copy = value + (size_t)i * dst_size;
         if (H5T_SGN_NONE == H5Tget_sign(native))
             HDsnprintf(tmp_str, TMP_LEN, "%u", *((unsigned int*)((void *)copy)));
         else
@@ -2557,6 +2557,7 @@ char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang, size_t *sl
 
     switch (tcls) {
         case H5T_INTEGER:
+        case H5T_BITFIELD:
             if (H5Tequal(dtype, H5T_STD_I8BE)) {
                 HDsnprintf(dt_str, *slen, "H5T_STD_I8BE");
             } else if (H5Tequal(dtype, H5T_STD_I8LE)) {
@@ -3053,9 +3054,19 @@ next:
         case H5T_TIME:
             HDsnprintf(dt_str, *slen, "H5T_TIME: not yet implemented");
             break;
-        case H5T_BITFIELD:
-            HDsnprintf(dt_str, *slen, "H5T_BITFIELD: not yet implemented");
+        case H5T_NO_CLASS:
+            HDsnprintf(dt_str, *slen, "H5T_NO_CLASS");
             break;
+        case H5T_REFERENCE:
+	    if (H5Tequal(dtype, H5T_STD_REF_DSETREG) == TRUE) {
+	      HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_DSETREG }");
+	    }
+	    else {
+	      HDsnprintf(dt_str, *slen, " H5T_REFERENCE { H5T_STD_REF_OBJECT }");
+	    }
+	    break;
+        case H5T_NCLASSES:
+	    break;
         default:
             HDsnprintf(dt_str, *slen, "unknown data type");
     }
diff --git a/hl/test/h5hltest.h b/hl/test/h5hltest.h
index 809c4ec..e8292d2 100644
--- a/hl/test/h5hltest.h
+++ b/hl/test/h5hltest.h
@@ -33,7 +33,7 @@
 #define TESTING2(WHAT)  {printf("%-70s", "Testing     " WHAT); fflush(stdout);}
 #define TESTING3(WHAT)  {printf("%-70s", "" WHAT); fflush(stdout);}
 
-/* Implrements verbose 'assert' with 'goto error' exit  */
+/* Implements verbose 'assert' with 'goto error' exit  */
 #define VERIFY(condition, string) do { if (!(condition)) FAIL_PUTS_ERROR(string) } while(0)
 
 #endif /* _H5HLTEST_H */
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 77d2b71..7b6fb82 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -3126,7 +3126,7 @@ static int test_simple(void)
     if(H5DSget_scale_name(dsid, name_out, (size_t)name_len+1) < 0)
         goto out;
 
-    if(HDstrncmp("Latitude set 0",name_out, name_len)!=0)
+    if(HDstrncmp("Latitude set 0",name_out, (size_t)name_len)!=0)
         goto out;
     if(name_out) {
         HDfree(name_out);
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index b0800a0..95ce535 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -501,20 +501,20 @@ filter_bogus1(unsigned int flags, size_t UNUSED cd_nelmts,
       size_t *buf_size, void **buf)
 {
     int *int_ptr=(int *)*buf;          /* Pointer to the data values */
-    ssize_t buf_left=*buf_size;  /* Amount of data buffer left to process */
+    ssize_t buf_left=(ssize_t)*buf_size;  /* Amount of data buffer left to process */
 
     if(flags & H5Z_FLAG_REVERSE) { /* read */
         /* Substract the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ -= (int)ADD_ON;
-            buf_left -= sizeof(int);
+            buf_left -= (ssize_t)sizeof(int);
         } /* end while */
     } /* end if */
     else { /* write */
         /* Add the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ += (int)ADD_ON;
-            buf_left -= sizeof(int);
+            buf_left -= (ssize_t)sizeof(int);
         } /* end while */
     } /* end else */
 
@@ -538,20 +538,20 @@ filter_bogus2(unsigned int flags, size_t UNUSED cd_nelmts,
       size_t *buf_size, void **buf)
 {
     int *int_ptr=(int *)*buf;          /* Pointer to the data values */
-    ssize_t buf_left=*buf_size;  /* Amount of data buffer left to process */
+    ssize_t buf_left=(ssize_t)*buf_size;  /* Amount of data buffer left to process */
 
     if(flags & H5Z_FLAG_REVERSE) { /* read */
         /* Substract the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ /= (int)FACTOR;
-            buf_left -= sizeof(int);
+            buf_left -= (ssize_t)sizeof(int);
         } /* end while */
     } /* end if */
     else { /* write */
         /* Add the "add on" value to all the data values */
         while(buf_left>0) {
             *int_ptr++ *= (int)FACTOR;
-            buf_left -= sizeof(int);
+            buf_left -= (ssize_t)sizeof(int);
         } /* end while */
     } /* end else */
 
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 19d3759..2337610 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -300,7 +300,7 @@ static int test_dsets( void )
 
     for (i = 0; i < DIM; i++)
     {
-        if ( data_float_in[i] != data_float_out[i] ) {
+        if(!FLT_ABS_EQUAL(data_float_in[i],data_float_out[i])) {
             goto out;
         }
     }
@@ -311,7 +311,7 @@ static int test_dsets( void )
 
     for (i = 0; i < DIM; i++)
     {
-        if ( data_float_in[i] != data_float_out[i] ) {
+        if(!FLT_ABS_EQUAL(data_float_in[i],data_float_out[i])) {
             goto out;
         }
     }
@@ -336,7 +336,7 @@ static int test_dsets( void )
 
     for (i = 0; i < DIM; i++)
     {
-        if ( data_double_in[i] != data_double_out[i] ) {
+        if(!DBL_ABS_EQUAL(data_double_in[i],data_double_out[i])) {
             goto out;
         }
     }
@@ -347,7 +347,7 @@ static int test_dsets( void )
 
     for (i = 0; i < DIM; i++)
     {
-        if ( data_double_in[i] != data_double_out[i] ) {
+        if(!DBL_ABS_EQUAL(data_double_in[i],data_double_out[i])) {
             goto out;
         }
     }
@@ -959,7 +959,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
 
     for (i = 0; i < 5; i++)
     {
-        if ( attr_float_in[i] != attr_float_out[i] ) {
+        if(!FLT_ABS_EQUAL(attr_float_in[i],attr_float_out[i])) {
             return -1;
         }
     }
@@ -970,7 +970,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
 
     for (i = 0; i < 5; i++)
     {
-        if ( attr_float_in[i] != attr_float_out[i] ) {
+        if(!FLT_ABS_EQUAL(attr_float_in[i],attr_float_out[i])) {
             return -1;
         }
     }
@@ -1003,7 +1003,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
 
     for (i = 0; i < 5; i++)
     {
-        if ( attr_double_in[i] != attr_double_out[i] ) {
+        if(!DBL_ABS_EQUAL(attr_double_in[i],attr_double_out[i])) {
             return -1;
         }
     }
@@ -1014,7 +1014,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
 
     for (i = 0; i < 5; i++)
     {
-        if ( attr_double_in[i] != attr_double_out[i] ) {
+        if(!DBL_ABS_EQUAL(attr_double_in[i],attr_double_out[i])) {
             return -1;
         }
     }
@@ -1046,7 +1046,7 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
 
     TESTING("H5LTget_attribute_info");
 
-    if(NULL==(dims_out = (hsize_t*) HDmalloc( sizeof(hsize_t) * rank_out ))) return -1;
+    if(NULL==(dims_out = (hsize_t*) HDmalloc( sizeof(hsize_t) * (size_t)rank_out ))) return -1;
 
     if ( H5LTget_attribute_info( loc_id, obj_name, ATTR2_NAME, dims_out, &type_class, &type_size) < 0 ) {
         HDfree( dims_out );
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 62e9ae3..256892b 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -75,8 +75,8 @@ static int cmp_par(size_t i, size_t j, particle_t *rbuf, particle_t *wbuf )
  if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
   rbuf[i].lati != wbuf[j].lati ||
   rbuf[i].longi != wbuf[j].longi ||
-  rbuf[i].pressure != wbuf[j].pressure ||
-  rbuf[i].temperature != wbuf[j].temperature ) {
+  !FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure) ||
+  !DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) ) {
   return -1;
  }
  return 0;
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index 8af6d28..3bc5e5f 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -166,14 +166,14 @@ static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf )
     if ( ( HDstrcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
         rbuf[i].lati != wbuf[j].lati ||
         rbuf[i].longi != wbuf[j].longi ||
-        rbuf[i].pressure != wbuf[j].pressure ||
-        rbuf[i].temperature != wbuf[j].temperature )
+	!FLT_ABS_EQUAL(rbuf[i].pressure,wbuf[j].pressure)  ||
+	!DBL_ABS_EQUAL(rbuf[i].temperature,wbuf[j].temperature) )
     {
         HDfprintf(stderr,"read and write buffers have differences\n");
         HDfprintf(stderr,"%s %ld %f %f %d\n",
-            rbuf[i].name,rbuf[i].longi,rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
+		  rbuf[i].name,rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
         HDfprintf(stderr,"%s %ld %f %f %d\n",
-            wbuf[j].name,wbuf[j].longi,wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
+		  wbuf[j].name,wbuf[j].longi,(double)wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
         return -1;
     }
     return 0;
@@ -1138,14 +1138,14 @@ static int test_table(hid_t fid, int do_write)
             {
                 if ( i >= 2 && i <= 4 )
                 {
-                    if ( rbuf[i].lati        != position_in[i-NRECORDS_ADD+1].lati ||
+                    if ( rbuf[i].lati       != position_in[i-NRECORDS_ADD+1].lati ||
                         rbuf[i].longi       != position_in[i-NRECORDS_ADD+1].longi ||
-                        rbuf[i].pressure    != pressure_in[i-NRECORDS_ADD+1] )
+			!FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
                     {
                         HDfprintf(stderr,"%ld %f %d\n",
-                            rbuf[i].longi,rbuf[i].pressure,rbuf[i].lati);
+				  rbuf[i].longi,(double)rbuf[i].pressure,rbuf[i].lati);
                         HDfprintf(stderr,"%ld %f %d\n",
-                            position_in[i].longi,pressure_in[i],position_in[i].lati);
+                            position_in[i].longi,(double)pressure_in[i],position_in[i].lati);
                         goto out;
                     }
                 }
@@ -1200,9 +1200,9 @@ static int test_table(hid_t fid, int do_write)
         goto out;
 
     /* Compare the extracted table with the initial values */
-    for( i = 0; i < NRECORDS; i++ )
+    for ( i = 0; i < NRECORDS; i++ )
     {
-        if ( pressure_out[i] != pressure_in[i] ) {
+        if ( !FLT_ABS_EQUAL(pressure_out[i], pressure_in[i]) ) {
             goto out;
         }
     }
@@ -1265,7 +1265,7 @@ static int test_table(hid_t fid, int do_write)
     for( i = 0; i < NRECORDS; i++ )
     {
         if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
-            namepre_out[i].pressure != namepre_in[i].pressure ) {
+	     !FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
                 goto out;
         }
     }
@@ -1294,7 +1294,7 @@ static int test_table(hid_t fid, int do_write)
     {
         hsize_t iistart = start;
         if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[iistart+i].name ) != 0 ) ||
-            namepre_out[i].pressure != namepre_in[iistart+i].pressure ) {
+	     !FLT_ABS_EQUAL(namepre_out[i].pressure, namepre_in[iistart+i].pressure) ) {
                 goto out;
         }
     }
@@ -1353,7 +1353,7 @@ static int test_table(hid_t fid, int do_write)
             {
                 if ( rbuf[i].lati        != position_in[i-NRECORDS_ADD+1].lati ||
                     rbuf[i].longi       != position_in[i-NRECORDS_ADD+1].longi ||
-                    rbuf[i].pressure    != pressure_in[i-NRECORDS_ADD+1] )
+		    !FLT_ABS_EQUAL(rbuf[i].pressure,pressure_in[i-NRECORDS_ADD+1]) )
                     goto out;
             }
         }
@@ -1406,7 +1406,7 @@ static int test_table(hid_t fid, int do_write)
     /* compare the extracted table with the initial values */
     for( i = 0; i < NRECORDS; i++ )
     {
-        if ( pressure_out[i] != pressure_in[i] ) {
+      if ( !FLT_ABS_EQUAL(pressure_out[i], pressure_in[i]) ) {
             goto out;
         }
     }
@@ -1471,10 +1471,10 @@ static int test_table(hid_t fid, int do_write)
     /* compare the extracted table with the initial values */
     for( i = 0; i < NRECORDS; i++ )
     {
-        if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
-            namepre_out[i].pressure != namepre_in[i].pressure ) {
-                goto out;
-        }
+      if ( ( HDstrcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
+	   !FLT_ABS_EQUAL(namepre_out[i].pressure,namepre_in[i].pressure) ) {
+	goto out;
+      }
     }
 
     /* reset buffer */
@@ -1502,8 +1502,8 @@ static int test_table(hid_t fid, int do_write)
     for( i = 0; i < 3; i++ )
     {
         int iistart = (int) start;
-        if ( ( HDstrcmp( namepre_out[i].name,  wbuf[iistart+i].name ) != 0 ) ||
-            namepre_out[i].pressure != wbuf[iistart+i].pressure ) {
+        if ( ( HDstrcmp( namepre_out[i].name,  wbuf[iistart+(int)i].name ) != 0 ) ||
+	     !FLT_ABS_EQUAL(namepre_out[i].pressure, wbuf[iistart+(int)i].pressure) ) {
                 goto out;
         }
     }
@@ -1546,8 +1546,8 @@ static int test_table(hid_t fid, int do_write)
             if ( ( HDstrcmp( rbuf2[i].name,  wbuf[i].name ) != 0 ) ||
                 rbuf2[i].lati          != wbuf[i].lati ||
                 rbuf2[i].longi         != wbuf[i].longi ||
-                rbuf2[i].pressure      != wbuf[i].pressure ||
-                rbuf2[i].temperature   != wbuf[i].temperature ||
+		!FLT_ABS_EQUAL(rbuf2[i].pressure,wbuf[i].pressure) ||
+		!DBL_ABS_EQUAL(rbuf2[i].temperature,wbuf[i].temperature) ||
                 rbuf2[i].new_field     != buf_new[i] ) {
                     goto out;
             }
@@ -1587,7 +1587,7 @@ static int test_table(hid_t fid, int do_write)
             if ( ( HDstrcmp( rbuf3[i].name, wbuf[i].name ) != 0 ) ||
                 rbuf3[i].lati != wbuf[i].lati ||
                 rbuf3[i].longi != wbuf[i].longi ||
-                rbuf3[i].temperature != wbuf[i].temperature ) {
+		!DBL_ABS_EQUAL(rbuf3[i].temperature,wbuf[i].temperature) ) {
                     goto out;
             }
         }
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index 1dae3b7..0528945 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -26,14 +26,14 @@
 /* Public Typedefs */
 /*******************/
 
-/* Plugin type */
+/* Plugin type used by the plugin library */
 typedef enum H5PL_type_t {
     H5PL_TYPE_ERROR        = -1,  /*error                    */
     H5PL_TYPE_FILTER       = 0,   /*filter                   */
     H5PL_TYPE_NONE         = 1    /*this must be last!       */
 } H5PL_type_t;
 
-/* Common dynamic plugin type flags */
+/* Common dynamic plugin type flags used by the set/get_loading_state functions */
 #define H5PL_FILTER_PLUGIN 0x0001
 #define H5PL_ALL_PLUGIN 0xFFFF
 
diff --git a/test/plugin.c b/test/plugin.c
index 3707411..02007d5 100644
--- a/test/plugin.c
+++ b/test/plugin.c
@@ -568,7 +568,7 @@ static herr_t
 test_noread_with_filters(hid_t file)
 {
     hid_t	dset;                 /* Dataset ID */
-    int     plugin_state;         /* status of plugins */
+    unsigned     plugin_state;         /* status of plugins */
     TESTING("Testing DYNLIB1 filter with plugins disabled");
 
     /* disable filter plugin */
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 0353955..46d895c 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -1363,7 +1363,7 @@ int main (void)
 
     TESTING("    several global filters");
 
-#if defined (H5_HAVE_FILTER_DEFLATE) && defined (H5_HAVE_FILTER_SHUFFLE)
+#if defined (H5_HAVE_FILTER_DEFLATE)
 
     if (h5repack_init (&pack_options, 0, fs_type, fs_size) < 0)
         GOERROR;