[svn-r27489] reverted merge of branch

1 files changed, 1327 insertions, 179 deletions

diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 57b4d4d..0d32dac 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -1,6 +1,6 @@
 /****h* H5Df/H5Df
  * PURPOSE
- *  This file contains C stubs for H5D Fortran APIs
+ *   This file contains C stubs for H5D Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -48,7 +48,7 @@
  * SOURCE
 */
 int_f
-h5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
+nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_t_f *space_id,
 	      hid_t_f *lcpl_id, hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 /******/
 {
@@ -84,23 +84,23 @@ DONE:
  * PURPOSE
  *  Call H5Dopen2 to open a dataset
  * INPUTS
- *  loc_id - file or group identifier
- *  name - name of the dataset
- *  namelen - name length
- *  dapl_id	- Dataset access property list
+ *      loc_id - file or group identifier
+ *              name - name of the dataset
+ *              namelen - name length
+ *              dapl_id	- Dataset access property list
  * OUTPUTS
- *  dset_id - dataset identifier
+ *     dset_id - dataset identifier
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, August 4, 1999
+ *              Wednesday, August 4, 1999
  * HISTORY
- *  Added 1.8 parameter: dapl_id
+ * Added 1.8 parameter: dapl_id
  * SOURCE
 */
 int_f
-h5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id)
+nh5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f *dset_id)
 /******/
 {
      char *c_name = NULL;
@@ -128,6 +128,531 @@ DONE:
      return ret_value;
 }
 
+
+/****if* H5Df/h5dwritec_c
+ * NAME
+ *  h5dwritec_c
+ * PURPOSE
+ *  Call h5dwrite_c to write a dataset of characters
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ *              buf      - character data buffer
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Tuesday, May 14, 2002
+ * HISTORY
+ * This function is added to accomodate oveloaded h5dwrite_f
+ *                with the dims argument being of INTEGER(HSIZE_T) type
+
+ * SOURCE
+*/
+int_f
+nh5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+/******/
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dwritec_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dwrite_c  function.
+      */
+     ret_value = nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+/****if* H5Df/h5dwrite_c
+ * NAME
+ *  h5dwrite_c
+ * PURPOSE
+ *  Call H5Dwrite to write a dataset
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ *              buf      - data buffer
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Tuesday, May 14, 2002
+ * HISTORY
+ * This function is added to accomodate oveloaded h5dwrite_f
+ *                with the dims argument being of INTEGER(HSIZE_T) type
+ *
+ *                Added nh5dwrite_integer(real,double)_s,1-7_c functions to eliminate
+ *                complains about wrong parameter types in h5dwrite_c function
+ *                called by Fortran rouitnes
+ *                                           October 10, 2006 EIP
+ *
+ * SOURCE
+*/
+int_f
+nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f H5_ATTR_UNUSED *dims)
+/******/
+{
+     int ret_value = -1;
+     herr_t ret;
+     hid_t c_dset_id;
+     hid_t c_mem_type_id;
+     hid_t c_mem_space_id;
+     hid_t c_file_space_id;
+     hid_t c_xfer_prp;
+
+     /*
+      * Define transfer property
+      */
+     c_xfer_prp = (hid_t)*xfer_prp;
+
+     /*
+      * Call H5Dwrite function.
+      */
+     c_dset_id = (hid_t)*dset_id;
+     c_mem_type_id = (hid_t)*mem_type_id;
+     c_mem_space_id = (hid_t)*mem_space_id;
+     c_file_space_id = (hid_t)*file_space_id;
+     ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
+
+     if (ret < 0) return ret_value;
+     ret_value = 0;
+     return ret_value;
+}
+
+int_f
+nh5dwrite_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+int_f
+nh5dwrite_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dwrite_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dwrite_c  function.
+      */
+     return nh5dwrite_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+
+/****if* H5Df/h5dwrite_ref_obj_c
+ * NAME
+ *  h5dwrite_ref_obj_c
+ * PURPOSE
+ *  Call H5Dwrite to write a dataset  of object references
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ *              buf      - data buffer with references to the objects.
+ *              n - number of references to be stored.
+ * RETURNS
+ *     0 on success,e-1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Tuesday, May 14, 2002
+ * HISTORY
+ * This function was added to accomodate h5dwrite_f with the
+ *                dims argumnet being of INTEGER(HSIZE_T) type.
+ * SOURCE
+*/
+int_f
+nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f *buf, hsize_t_f *dims)
+/******/
+{
+    int ret_value = -1;
+    herr_t ret;
+    hid_t c_dset_id;
+    hid_t c_mem_type_id;
+    hid_t c_mem_space_id;
+    hid_t c_file_space_id;
+    hid_t c_xfer_prp;
+    hobj_ref_t *buf_c;
+    unsigned int i, n;
+
+    /*
+     * Define transfer property
+     */
+    c_xfer_prp = (hid_t)*xfer_prp;
+
+    /*
+     * Allocate temporary buffer and copy references from Fortran.
+     */
+    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++)
+             HDmemcpy(&buf_c[i], &buf[i], sizeof(haddr_t));
+    }
+    else return ret_value;
+
+    /*
+     * Call H5Dwrite function.
+     */
+    c_dset_id = (hid_t)*dset_id;
+    c_mem_type_id = (hid_t)*mem_type_id;
+    c_mem_space_id = (hid_t)*mem_space_id;
+    c_file_space_id = (hid_t)*file_space_id;
+    ret = H5Dwrite(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
+    HDfree(buf_c);
+    if (ret < 0) return ret_value;
+    ret_value = 0;
+    return ret_value;
+}
+
 /****if* H5Df/h5dwrite_ref_reg_c
  * NAME
  *  h5dwrite_ref_reg_c
@@ -152,7 +677,7 @@ DONE:
  * SOURCE
 */
 int_f
-h5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims)
+nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims)
 /******/
 {
      int ret_value = -1;
@@ -198,31 +723,549 @@ h5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i
      return ret_value;
 }
 
+
+
+/****if* H5Df/h5dreadc_c
+ * NAME
+ *  h5dreadc_c
+ * PURPOSE
+ *  Call h5dread_c to read a dataset of characters
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ * OUTPUTS
+ *     buf      - character data buffer
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Wednesday, May 15, 2002
+ * HISTORY
+ * This function was added to accomodate h5dread_f subroutine
+ *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
+ * SOURCE
+*/
+int_f
+nh5dreadc_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+/******/
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+int_f
+nh5dreadc_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims)
+
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dread_c  function.
+      */
+     ret_value = nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, _fcdtocp(buf), dims);
+
+     return ret_value;
+}
+
+/****if* H5Df/h5dread_c
+ * NAME
+ *  h5dread_c
+ * PURPOSE
+ *  Call H5Draed to read a dataset
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ * OUTPUTS
+ *     buf      - data buffer
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Wednesday, May 15, 2002
+ * HISTORY
+ * This function was added to accomodate h5dread_f subroutine
+ *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
+ *
+ *                Added nh5dread_integer(real,double)_s,1-7_c functions to eliminate
+ *                complains about wrong parameter types in h5dwrite_c function
+ *                called by Fortran rouitnes
+ *                                           October 10, 2006 EIP
+ *
+ * SOURCE
+*/
+int_f
+nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f H5_ATTR_UNUSED *dims)
+/******/
+{
+     int ret_value = -1;
+     herr_t ret;
+     hid_t c_dset_id;
+     hid_t c_mem_type_id;
+     hid_t c_mem_space_id;
+     hid_t c_file_space_id;
+     hid_t c_xfer_prp;
+
+     /*
+      * Define transfer property
+      */
+     c_xfer_prp = (hid_t)*xfer_prp;
+
+     /*
+      * Call H5Dread function.
+      */
+     c_dset_id = (hid_t)*dset_id;
+     c_mem_type_id = (hid_t)*mem_type_id;
+     c_mem_space_id = (hid_t)*mem_space_id;
+     c_file_space_id = (hid_t)*file_space_id;
+     ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf);
+
+     if (ret < 0) return ret_value;
+     ret_value = 0;
+     return ret_value;
+}
+
+int_f
+nh5dread_integer_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_integer_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_real_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_s_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_1_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_2_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_3_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_4_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_5_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_6_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+int_f
+nh5dread_double_7_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf, hsize_t_f *dims)
+
+{
+     /*
+      * Call h5dread_c  function.
+      */
+     return nh5dread_c(dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp, buf, dims);
+}
+
+/****if* H5Df/h5dread_ref_obj_c
+ * NAME
+ *  h5dread_ref_obj_c
+ * PURPOSE
+ *  Call H5Dread to read a dataset  of object references
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ *              buf      - data buffer to store references to the objects.
+ *              n - number of references to be stored.
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Wednesday, May 15, 2002
+ * HISTORY
+ * This function was added to accomodate h5dread_f subroutine
+ *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
+ * SOURCE
+*/
+int_f
+nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, haddr_t_f * buf, hsize_t_f *dims)
+/******/
+{
+    int ret_value = -1;
+    herr_t ret = -1;
+    hid_t c_dset_id;
+    hid_t c_mem_type_id;
+    hid_t c_mem_space_id;
+    hid_t c_file_space_id;
+    hid_t c_xfer_prp;
+    hobj_ref_t *buf_c = NULL;
+    hsize_t i,n;
+
+    /*
+     * Define transfer property
+     */
+    c_xfer_prp = (hid_t)*xfer_prp;
+
+    /*
+     * Allocate temporary buffer.
+     */
+    n = (hsize_t)*dims;
+    buf_c = (hobj_ref_t*)HDmalloc(sizeof(hobj_ref_t)*(size_t)n);
+    if ( buf_c != NULL ) {
+        /*
+         * Call H5Dread function.
+         */
+        c_dset_id = (hid_t)*dset_id;
+        c_mem_type_id = (hid_t)*mem_type_id;
+        c_mem_space_id = (hid_t)*mem_space_id;
+        c_file_space_id = (hid_t)*file_space_id;
+        ret = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, buf_c);
+        if (ret >=0) {
+           for (i = 0; i < n; i++)
+              HDmemcpy(&buf[i], &buf_c[i], sizeof(haddr_t));
+        }
+        if ( buf_c != NULL ) HDfree(buf_c);
+    }
+    if (ret < 0) return ret_value;
+    ret_value = 0;
+    return ret_value;
+}
+
 /****if* H5Df/h5dread_ref_reg_c
  * NAME
  *  h5dread_ref_reg_c
  * PURPOSE
  *  Call H5Dread to read a dataset of dataset region references
  * INPUTS
- *  dset_id - dataset identifier
- *  mem_type_id - memory datatype identifier
- *  mem_space_id - memory dataspace identifier
- *  file_space_id - memory dataspace identifier
- *  xfer_pr  - identifier of transfer property list
- *  buf      - data buffer to store references to the objects.
- *  n - number of references to be stored.
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              mem_space_id - memory dataspace identifier
+ *              file_space_id - memory dataspace identifier
+ *              xfer_pr  - identifier of transfer property list
+ *              buf      - data buffer to store references to the objects.
+ *              n - number of references to be stored.
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, May 15, 2002
+ *              Wednesday, May 15, 2002
  * HISTORY
- *  This function was added to accomodate h5dread_f subroutine
- *  with the dims parameter being of INTEGER(HSIZE_T_F) size.
+ * This function was added to accomodate h5dread_f subroutine
+ *                with the dims parameter being of INTEGER(HSIZE_T_F) size.
  * SOURCE
 */
 int_f
-h5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f * buf, hsize_t_f *dims)
+nh5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f * buf, hsize_t_f *dims)
 /******/
 {
      int ret_value = -1;
@@ -274,19 +1317,19 @@ h5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id
  * PURPOSE
  *  Call H5Dclose to close a dataset
  * INPUTS
- *  dset_id - identifier of the dataset to be closed
+ *      dset_id - identifier of the dataset to be closed
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, August 4, 1999
+ *              Wednesday, August 4, 1999
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dclose_c ( hid_t_f *dset_id )
+nh5dclose_c ( hid_t_f *dset_id )
 /******/
 {
   int ret_value = 0;
@@ -302,21 +1345,21 @@ h5dclose_c ( hid_t_f *dset_id )
  * PURPOSE
  *  Call H5Dget_space to obtain dataspace of a dataset
  * INPUTS
- *  dset_id - identifier of the dataset
+ *      dset_id - identifier of the dataset
  * OUTPUTS
- *  space_id - identifier of the dataset's dataspace
+ *     space_id - identifier of the dataset's dataspace
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 19, 1999
+ *              Thursday, August 19, 1999
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id)
+nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id)
 /******/
 {
   int ret_value = -1;
@@ -337,21 +1380,21 @@ h5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id)
  * PURPOSE
  *  Call H5Dget_type to obtain datatype of a dataset
  * INPUTS
- *  dset_id - identifier of the dataset
+ *      dset_id - identifier of the dataset
  * OUTPUTS
- *  type_id - identifier of the dataset's datatype
+ *     type_id - identifier of the dataset's datatype
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 19, 1999
+ *              Thursday, August 19, 1999
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id)
+nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id)
 /******/
 {
   int ret_value = -1;
@@ -373,23 +1416,23 @@ h5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id)
  *  h5dget_create_plist_c
  * PURPOSE
  *  Call H5Dget_create_plist to obtain creation property list
- *  of a dataset
+ *              of a dataset
  * INPUTS
- *  dset_id - identifier of the dataset
+ *      dset_id - identifier of the dataset
  * OUTPUTS
- *  plist_id - identifier of he dataset creation property list
+ *     plist_id - identifier of he dataset creation property list
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 19, 1999
+ *              Thursday, August 19, 1999
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
+nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
 /******/
 {
   int ret_value = -1;
@@ -413,24 +1456,24 @@ h5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
  * PURPOSE
  *  Call H5Dset_extent to extend dataset with unlimited dimensions
  * INPUTS
- *  dset_id - identifier of the dataset
+ *      dset_id - identifier of the dataset
  * OUTPUTS
- *  dims - array with the dimension sizes
+ *     dims - array with the dimension sizes
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 19, 1999
+ *              Thursday, August 19, 1999
  *
  * HISTORY
- *  Changed name from the now obsolete h5dextend
- *  to h5dset_extent in order to match new fortran interface.
+ * Changed name from the now obsolete h5dextend
+ *                to h5dset_extent in order to match new fortran interface.
  *                -MSB- March 14, 2008
  * SOURCE
 */
 
 int_f
-h5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
+nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
 /******/
 {
   hid_t c_space_id;
@@ -460,28 +1503,28 @@ h5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
   return ret_value;
 }
 
-/****if* H5Df/h5dget_storage_size_c
+/****if* H5Df/nh5dget_storage_size_c
  * NAME
- *  h5dget_storage_size_c
+ *  nh5dget_storage_size_c
  * PURPOSE
  *  Call H5Dget_storage_size to return the amount of storage
- *  required for a dataset
+ *              required for a dataset
  * INPUTS
- *  dset_id - identifier of the dataset
+ *      dset_id - identifier of the dataset
  * OUTPUTS
- *  size    - the amount of storage required for a dataset
+ *     size    - the amount of storage required for a dataset
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Tuesday, October 22, 2002
+ *              Tuesday, October 22, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size)
+nh5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size)
 /******/
 {
   int ret_value = -1;
@@ -496,29 +1539,29 @@ h5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size)
   return ret_value;
 }
 
-/****if* H5Df/h5dvlen_get_max_len_c
+/****if* H5Df/nh5dvlen_get_max_len_c
  * NAME
- *  h5dvlen_get_max_len_c
+ *  nh5dvlen_get_max_len_c
  * PURPOSE
  *  Get the maximum size of the VL dataset element
  * INPUTS
- *  dset_id - identifier of the dataset
- *  type_id - datatype identifier
- *  space_id - dataspace identifier
+ *      dset_id - identifier of the dataset
+ *              type_id - datatype identifier
+ *              space_id - dataspace identifier
  * OUTPUTS
- *  len      - maximum length of the VL dataset element
+ *     len      - maximum length of the VL dataset element
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Tuesday, October 22, 2002
+ *              Tuesday, October 22, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dvlen_get_max_len_c ( hid_t_f *dset_id ,  hid_t_f *type_id, hid_t_f *space_id, size_t_f *len)
+nh5dvlen_get_max_len_c ( hid_t_f *dset_id ,  hid_t_f *type_id, hid_t_f *space_id, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -554,34 +1597,34 @@ DONE:
   HDfree(c_buf);
   return ret_value;
 }
-/****if* H5Df/h5dwrite_vl_integer_c
+/****if* H5Df/nh5dwrite_vl_integer_c
  * NAME
- *  h5dwrite_vl_integer_c
+ *  nh5dwrite_vl_integer_c
  * PURPOSE
  *  Write variable length dataset
  * INPUTS
- *  dset_id - identifier of the dataset
- *  mem_type_id - datatype identifier
- *  mem_space_id - dataspace identifier
- *  file_space_id - file dataspace identifier
- *  xfer          - file transfer property
- *  buf           - data buffer
- *  dims          - one-demnsional array of size 2
- *  dims[0] = MAXLENGTH
- *  dims[1] = number of elements of VL type
- *  len           - array element lenghts
+ *      dset_id - identifier of the dataset
+ *              mem_type_id - datatype identifier
+ *              mem_space_id - dataspace identifier
+ *              file_space_id - file dataspace identifier
+ *              xfer          - file transfer property
+ *              buf           - data buffer
+ *              dims          - one-demnsional array of size 2
+ *                              dims[0] = MAXLENGTH
+ *                              dims[1] = number of elements of VL type
+ *              len           - array element lenghts
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, October 23, 2002
+ *              Wednesday, October 23, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dwrite_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
+nh5dwrite_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -627,35 +1670,35 @@ DONE:
   return ret_value;
 }
 
-/****if* H5Df/h5dread_vl_integer_c
+/****if* H5Df/nh5dread_vl_integer_c
  * NAME
- *  h5dread_vl_integer_c
+ *  nh5dread_vl_integer_c
  * PURPOSE
  *  Read variable length dataset
  * INPUTS
- *  dset_id - identifier of the dataset
- *  mem_type_id - datatype identifier
- *  mem_space_id - dataspace identifier
- *  file_space_id - file dataspace identifier
- *  xfer          - file transfer property
- *  dims          - one-demnsional array of size 2
- *  dims[0] = MAXLENGTH
- *  dims[1] = number of elements of VL type
+ *      dset_id - identifier of the dataset
+ *              mem_type_id - datatype identifier
+ *              mem_space_id - dataspace identifier
+ *              file_space_id - file dataspace identifier
+ *              xfer          - file transfer property
+ *              dims          - one-demnsional array of size 2
+ *                              dims[0] = MAXLENGTH
+ *                              dims[1] = number of elements of VL type
  * OUTPUTS
- *  buf           - data buffer
- *  len           - array element lenghts
+ *     buf           - data buffer
+ *              len           - array element lenghts
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, October 24, 2002
+ *              Wednesday, October 24, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dread_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
+nh5dread_vl_integer_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, int_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -699,33 +1742,33 @@ DONE:
   return ret_value;
 }
 
-/****if* H5Df/h5dwrite_vl_string_c
+/****if* H5Df/nh5dwrite_vl_string_c
  * NAME
- *  h5dwrite_vl_string_c
+ *  nh5dwrite_vl_string_c
  * PURPOSE
  *  Write variable length strings from Fortran program
  * INPUTS
- *  dset_id - identifier of the dataset
- *  mem_type_id - datatype identifier
- *  mem_space_id - dataspace identifier
- *  file_space_id - file dataspace identifier
- *  xfer          - file transfer property
- *  buf           - data buffer
- *  dims          - one-demnsional array of size 2
- *  dims[0] = number of strings of size max_len
- *  len           - array of strings lengths
+ *      dset_id - identifier of the dataset
+ *              mem_type_id - datatype identifier
+ *              mem_space_id - dataspace identifier
+ *              file_space_id - file dataspace identifier
+ *              xfer          - file transfer property
+ *              buf           - data buffer
+ *              dims          - one-demnsional array of size 2
+ *                              dims[0] = number of strings of size max_len
+ *              len           - array of strings lengths
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Monday, October 28, 2002
+ *              Monday, October 28, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dwrite_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
+nh5dwrite_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -786,33 +1829,33 @@ DONE:
   HDfree(tmp);
   return ret_value;
 }
-/****if* H5Df/h5dread_vl_string_c
+/****if* H5Df/nh5dread_vl_string_c
  * NAME
- *  h5dread_vl_string_c
+ *  nh5dread_vl_string_c
  * PURPOSE
  *  Read variable length strings from Fortran program
  * INPUTS
- *  dset_id - identifier of the dataset
- *  mem_type_id - datatype identifier
- *  mem_space_id - dataspace identifier
- *  file_space_id - file dataspace identifier
- *  xfer          - file transfer property
- *  dims          - one-demnsional array of size 2
- *  dims[0] = number of strings of size max_len
- *  Output:      buf           - data buffer
- *  len           - array of strings lengths
+ *      dset_id - identifier of the dataset
+ *              mem_type_id - datatype identifier
+ *              mem_space_id - dataspace identifier
+ *              file_space_id - file dataspace identifier
+ *              xfer          - file transfer property
+ *              dims          - one-demnsional array of size 2
+ *                              dims[0] = number of strings of size max_len
+ * Output:      buf           - data buffer
+ *              len           - array of strings lengths
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Friday, November 1, 2002
+ *              Friday, November 1, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
+nh5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, _fcd buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -869,34 +1912,34 @@ h5dread_vl_string_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_spac
   return ret_value;
 }
 
-/****if* H5Df/h5dwrite_vl_real_c
+/****if* H5Df/nh5dwrite_vl_real_c
  * NAME
- *  h5dwrite_vl_real_c
+ *  nh5dwrite_vl_real_c
  * PURPOSE
  *  Write variable length dataset
  * INPUTS
- *  dset_id - identifier of the dataset
- *  mem_type_id - datatype identifier
- *  mem_space_id - dataspace identifier
- *  file_space_id - file dataspace identifier
- *  xfer          - file transfer property
- *  buf           - data buffer
- *  dims          - one-demnsional array of size 2
- *  dims[0] = MAXLENGTH
- *  dims[1] = number of elements of VL type
- *  len           - array element lenghts
+ *      dset_id - identifier of the dataset
+ *              mem_type_id - datatype identifier
+ *              mem_space_id - dataspace identifier
+ *              file_space_id - file dataspace identifier
+ *              xfer          - file transfer property
+ *              buf           - data buffer
+ *              dims          - one-demnsional array of size 2
+ *                              dims[0] = MAXLENGTH
+ *                              dims[1] = number of elements of VL type
+ *              len           - array element lenghts
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Monday, November 11, 2002
+ *              Monday, November 11, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dwrite_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
+nh5dwrite_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -942,35 +1985,35 @@ DONE:
   return ret_value;
 }
 
-/****if* H5Df/h5dread_vl_real_c
+/****if* H5Df/nh5dread_vl_real_c
  * NAME
- *  h5dread_vl_real_c
+ *  nh5dread_vl_real_c
  * PURPOSE
  *  Read variable length dataset
  * INPUTS
- *  dset_id - identifier of the dataset
- *  mem_type_id - datatype identifier
- *  mem_space_id - dataspace identifier
- *  file_space_id - file dataspace identifier
- *  xfer          - file transfer property
- *  dims          - one-demnsional array of size 2
- *  dims[0] = MAXLENGTH
- *  dims[1] = number of elements of VL type
+ *      dset_id - identifier of the dataset
+ *              mem_type_id - datatype identifier
+ *              mem_space_id - dataspace identifier
+ *              file_space_id - file dataspace identifier
+ *              xfer          - file transfer property
+ *              dims          - one-demnsional array of size 2
+ *                              dims[0] = MAXLENGTH
+ *                              dims[1] = number of elements of VL type
  * OUTPUTS
- *  buf           - data buffer
- *  len           - array element lenghts
+ *     buf           - data buffer
+ *              len           - array element lenghts
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Monday, November 11, 2002
+ *              Monday, November 11, 2002
  * HISTORY
  *
  * SOURCE
 */
 
 int_f
-h5dread_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
+nh5dread_vl_real_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t_f *file_space_id, hid_t_f *xfer_prp, real_f *buf, hsize_t_f *dims, size_t_f *len)
 /******/
 {
   int ret_value = -1;
@@ -1015,6 +2058,39 @@ DONE:
   return ret_value;
 }
 
+/****if* H5Df/h5dfillc_c
+ * NAME
+ *  h5dfillc_c
+ * PURPOSE
+ *  Call h5fill_c to fill memory buffer with a fill value
+ * INPUTS
+ *  fill_value   - fill value
+ *  fill_type_id - fill value datatype identifier
+ *  space_id     - memory space selection identifier
+ *  buf          - memory buffer to fill
+ *  mem_type_id  - memory buffer dtatype identifier
+ * RETURNS
+ *  0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *  Wednesday, March 12, 2003
+ * HISTORY
+ *
+ * SOURCE
+*/
+int_f
+nh5dfillc_c (_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id)
+/******/
+{
+     int ret_value = -1;
+
+     /*
+      * Call h5dfill_c  function.
+      */
+     ret_value = h5dfill_c(_fcdtocp(fill_value), fill_type_id, space_id, _fcdtocp(buf), mem_type_id);
+
+     return ret_value;
+}
 /****if* H5Df/h5dfill_c
  * NAME
  *  h5dfill_c
@@ -1059,26 +2135,98 @@ h5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * b
      return ret_value;
 }
 
+int_f
+nh5dfill_integer_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+
+{
+     int ret_value = -1;
+     herr_t ret;
+     hid_t c_fill_type_id;
+     hid_t c_mem_type_id;
+     hid_t c_space_id;
+
+     c_fill_type_id = (hid_t)*fill_type_id;
+     c_mem_type_id = (hid_t)*mem_type_id;
+     c_space_id = (hid_t)*space_id;
+
+     /*
+      * Call H5Dfill function.
+      */
+     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
+
+     if (ret < 0) return ret_value;
+     ret_value = 0;
+     return ret_value;
+}
+
+int_f
+nh5dfill_real_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+
+{
+     int ret_value = -1;
+     herr_t ret;
+     hid_t c_fill_type_id;
+     hid_t c_mem_type_id;
+     hid_t c_space_id;
+
+     c_fill_type_id = (hid_t)*fill_type_id;
+     c_mem_type_id = (hid_t)*mem_type_id;
+     c_space_id = (hid_t)*space_id;
+
+     /*
+      * Call H5Dfill function.
+      */
+     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
+
+     if (ret < 0) return ret_value;
+     ret_value = 0;
+     return ret_value;
+}
+
+int_f
+nh5dfill_double_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * buf, hid_t_f *mem_type_id)
+
+{
+     int ret_value = -1;
+     herr_t ret;
+     hid_t c_fill_type_id;
+     hid_t c_mem_type_id;
+     hid_t c_space_id;
+
+     c_fill_type_id = (hid_t)*fill_type_id;
+     c_mem_type_id = (hid_t)*mem_type_id;
+     c_space_id = (hid_t)*space_id;
+
+     /*
+      * Call H5Dfill function.
+      */
+     ret = H5Dfill(fill_value, c_fill_type_id, buf, c_mem_type_id, c_space_id);
+
+     if (ret < 0) return ret_value;
+     ret_value = 0;
+     return ret_value;
+}
+
 /****if* H5Df/h5dget_space_status_c
  * NAME
  *  h5dget_space_status_c
  * PURPOSE
  *  Call H5Dget_space_status to request dataspace allocation status
  * INPUTS
- *  dset_id - dataset identifier
+ *      dset_id - dataset identifier
  * OUTPUTS
- *  flag - status flag
+ *     flag - status flag
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Wednesday, March 12, 2003
+ *              Wednesday, March 12, 2003
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
+nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
 /******/
 {
      int ret_value = -1;
@@ -1108,21 +2256,21 @@ h5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
  *		loc_id	   - Identifier of the file or group within which to create the dataset.
  *		type_id	   - Identifier of the datatype to use when creating the dataset.
  *		space_id   - Identifier of the dataspace to use when creating the dataset.
- *  dcpl_id    - Dataset creation property list identifier.
- *  dapl_id    - Dataset access property list identifier.
+ *              dcpl_id    - Dataset creation property list identifier.
+ *              dapl_id    - Dataset access property list identifier.
  * OUTPUTS
  *
- *  dset_id - dataset identifier
+ *              dset_id - dataset identifier
  *
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  February, 2008
+ *              February, 2008
  * SOURCE
 */
 int_f
-h5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
+nh5dcreate_anon_c (hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
 		   hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id)
 /******/
 {
@@ -1207,8 +2355,8 @@ h5dwrite_f_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
  *  file_space_id - file dataspace identifier
  *  xfer          - file transfer property
  *  dims          - one-demnsional array of size 2
- *  dims[0] = MAXLENGTH
- *  dims[1] = number of elements of VL type
+ *                   dims[0] = MAXLENGTH
+ *                   dims[1] = number of elements of VL type
  * OUTPUTS
  *  buf - data buffer
  *  len - array element lenghts
@@ -1248,9 +2396,9 @@ h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
   ret_value = 0;
   return ret_value;
 }
-/****if* H5Df/h5dget_access_plist_c
+/****if* H5Df/nh5dget_access_plist_c
  * NAME
- *  h5dget_access_plist_c
+ *  nh5dget_access_plist_c
  * PURPOSE
  *  Call H5Dget_access_plist
  * INPUTS
@@ -1266,7 +2414,7 @@ h5dread_f_c ( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
  * SOURCE
 */
 int_f
-h5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
+nh5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
 /******/
 {
   int ret_value = -1;
@@ -1282,22 +2430,22 @@ h5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
   return ret_value;
 }
 
-/****if* H5Df/h5dvlen_reclaim_c
+/****if* H5Df/nh5dvlen_reclaim_c
  * NAME
  *  h5dvlen_reclaim_c
  * PURPOSE
  *  Call H5Dvlen_reclaim
  * INPUTS
- *  type_id   - Identifier of the datatype. 
- *  space_id  - Identifier of the dataspace. 
- *  plist_id  - Identifier of the property list used to create the buffer. 
- *  buf       - Pointer to the buffer to be reclaimed.    
+ *   type_id   - Identifier of the datatype. 
+ *   space_id  - Identifier of the dataspace. 
+ *   plist_id  - Identifier of the property list used to create the buffer. 
+ *   buf       - Pointer to the buffer to be reclaimed.    
  *
  * RETURNS
- *  0 on success, -1 on failure
+ *   0 on success, -1 on failure
  * AUTHOR
  *   M. Scot Breitenfeld
- *  January 15, 2011 
+ *   January 15, 2011 
  *
  * SOURCE
 */