[svn-r27489] reverted merge of branch

1 files changed, 1241 insertions, 205 deletions

diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index 8f012cf..bc2e9f1 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -1,6 +1,6 @@
 /****h* H5Af/H5Af
  * PURPOSE
- *  This file contains C stubs for H5A Fortran APIs
+ *   This file contains C stubs for H5A Fortran APIs
  *
  * COPYRIGHT
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -26,29 +26,29 @@
 
 /****if* H5Af/h5acreate_c
  * NAME
- *  h5acreate_c
+ *        h5acreate_c
  * PURPOSE
- *  Call H5Acreate2 to create an attribute
+ *     Call H5Acreate2 to create an attribute
  * INPUTS
- *  obj_id - object identifier
- *  name - name of the attribute
- *  namelen - name length
- *  type_id - datatype identifier
- *  space_id - dataspace identifier
- *  crt_pr  - identifier of creation property list
+ *      obj_id - object identifier
+ *              name - name of the attribute
+ *              namelen - name length
+ *              type_id - datatype identifier
+ *              space_id - dataspace identifier
+ *              crt_pr  - identifier of creation property list
  * OUTPUTS
- *  attr_id - attribute identifier
+ *     attr_id - attribute identifier
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 12, 1999
+ *              Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id,
+nh5acreate_c(hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *type_id,
     hid_t_f *space_id, hid_t_f *crt_prp, hid_t_f *aapl, hid_t_f *attr_id)
 /*******/
 {
@@ -73,26 +73,894 @@ done:
     return ret_value;
 }
 
+/****if* H5Af/h5aopen_name_c
+ * NAME
+ *        h5aopen_name_c
+ * PURPOSE
+ *     Call H5Aopen to open an attribute
+ * INPUTS
+ *      obj_id - object identifier
+ *              name - name of the attribute
+ *              namelen - name length
+ * OUTPUTS
+ *     attr_id - dataset identifier
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ *
+ * SOURCE
+*/
+int_f
+nh5aopen_name_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_id)
+/*******/
+{
+    char *c_name = NULL;          /* Buffer to hold C string */
+    int_f ret_value = 0;          /* Return value */
+
+     /*
+      * Convert FORTRAN name to C name
+      */
+     if((c_name = HD5f2cstring(name, (size_t)*namelen)) == NULL)
+        HGOTO_DONE(FAIL);
+
+     /*
+      * Call H5Aopen function.
+      */
+     if((*attr_id = (hid_t_f)H5Aopen((hid_t)*obj_id, c_name, H5P_DEFAULT)) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+    if(c_name)
+        HDfree(c_name);
+    return ret_value;
+}
+
+/****if* H5Af/h5awritec_c
+ * NAME
+ *        h5awritec_c
+ * PURPOSE
+ *     Call h5awrite_c to write a character  attribute
+ * INPUTS
+ *      attr_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              buf      - character data buffer
+ *              dims     - array to store dimensions sizes of buf; used only
+ *                         by Fortran routine.
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday , August 12, 1999
+ * HISTORY
+ * dims paramete added.
+ *                April 4, 2001
+ * SOURCE
+*/
+int_f
+nh5awritec_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+int_f
+nh5awritec_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5awritec_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+
+
+/****if* H5Af/h5awrite_c
+ * NAME
+ *        h5awrite_c
+ * PURPOSE
+ *     Call H5Awrite to write a attribute
+ * INPUTS
+ *      attr_id - attribute identifier
+ *              mem_type_id - memory datatype identifier
+ *              buf      - data buffer
+ *              dims     - array to store dimensions sizes of buf; used only
+ *                         by Fortran routine.
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ * dims parameter added
+ *                                           April 4, 2001
+ *                Added nh5awrite_integer(real,double)_s,1-7 functions to eliminate
+ *                complains about wrong parameters types in h5awrite_c function
+ *                called by Fortran routines.
+ *                                           October 9, 2006 EIP
+ * SOURCE
+*/
+int_f
+nh5awrite_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+     /*
+      * Call h5awrite_c  function.
+      */
+     return nh5awrite_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5awrite_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED *dims)
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+     /*
+      * Call H5Awrite function.
+      */
+     if (H5Awrite((hid_t)*attr_id, (hid_t)*mem_type_id, buf) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+     return ret_value;
+}
+
+
+/****if* H5Af/h5areadc_c
+ * NAME
+ *        h5areadc_c
+ * PURPOSE
+ *     Call h5aread_c to read character  attribute
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              dims     - array to store dimensions sizes of buf; used only
+ *                         by Fortran routine.
+ * OUTPUTS
+ *     buf      - character data buffer
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ * dims parameter added.
+ *                April 4, 2001
+ *                Added nh5areadc_s,1-7 functions to eliminate
+ *                complains about wrong parameters types in h5awrite_c function
+ *                called by Fortran routines.
+ *                                           October 9, 2006 EIP
+ * SOURCE
+*/
+int_f
+nh5areadc_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+int_f
+nh5areadc_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5areadc_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5areadc_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5areadc_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5areadc_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5areadc_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+int_f
+nh5areadc_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+int_f
+nh5areadc_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, _fcd buf, void *dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, _fcdtocp(buf), dims);
+}
+
+
+
+/****if* H5Af/h5aread_c
+ * NAME
+ *        h5aread_c
+ * PURPOSE
+ *     Call H5Aread to read an attribute
+ * INPUTS
+ *      dset_id - dataset identifier
+ *              mem_type_id - memory datatype identifier
+ *              dims     - array to store dimensions sizes of buf; used only
+ *                         by Fortran routine.
+ * OUTPUTS
+ *     buf      - data buffer
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ * dims paramete added.
+ *                April 4, 2001
+ *                Added nh5aread_integer(real,double)_s,1-7 functions to eliminate
+ *                complains about wrong parameters types in h5awrite_c function
+ *                called by Fortran routines.
+ *                                           October 9, 2006 EIP
+ * SOURCE
+*/
+int_f
+nh5aread_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+     /*
+      * Call H5Aread function.
+      */
+     if (H5Aread((hid_t)*attr_id, (hid_t)*mem_type_id, buf) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+     return ret_value;
+}
+
+int_f
+nh5aread_integer_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_integer_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_real_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_s_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_1_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_2_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_3_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_4_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_5_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_6_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+int_f
+nh5aread_double_7_c (hid_t_f *attr_id, hid_t_f *mem_type_id, void *buf, void H5_ATTR_UNUSED * dims)
+/******/
+{
+     /*
+      * Call h5aread_c  function.
+      */
+     return nh5aread_c(attr_id, mem_type_id, buf, dims);
+}
+
+
+/****if* H5Af/h5aclose_c
+ * NAME
+ *        h5aclose_c
+ * PURPOSE
+ *     Call H5Aclose to close an attribute
+ * INPUTS
+ *      attr_id - identifier of an attribute to be closed
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ *
+ * SOURCE
+*/
+
+int_f
+nh5aclose_c ( hid_t_f *attr_id )
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+    if (H5Aclose((hid_t)*attr_id) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
 /****if* H5Af/h5adelete_c
  * NAME
- *  h5adelete_c
+ *        h5adelete_c
  * PURPOSE
- *  Call H5Adelete to delete an attribute
+ *     Call H5Adelete to delete an attribute
  * INPUTS
- *  obj_id - object identifier
- *  name - name of the attribute
- *  namelen - name length
+ *      obj_id - object identifier
+ *              name - name of the attribute
+ *              namelen - name length
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 12, 1999
+ *              Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5adelete_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen)
+nh5adelete_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen)
 /******/
 {
     char *c_name = NULL;        /* Buffer to hold C string */
@@ -117,26 +985,131 @@ done:
     return ret_value;
 }
 
+
+/****if* H5Af/h5aopen_idx_c
+ * NAME
+ *        h5aopen_idx_c
+ * PURPOSE
+ *     Call H5Aopen_by_idx to open an attribute
+ * INPUTS
+ *      obj_id - object identifier
+ *              idx    - attribute index ( zero based)
+ * OUTPUTS
+ *     attr_id - attribute identifier
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ *
+ * SOURCE
+*/
+int_f
+nh5aopen_idx_c (hid_t_f *obj_id, int_f *idx, hid_t_f *attr_id)
+/******/
+{
+    int_f ret_value = 0;          /* Return value */
+
+     /*
+      * Call H5Aopen_by_idx function.
+      */
+     if((*attr_id = (hid_t_f)H5Aopen_by_idx((hid_t)*obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)*idx, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+     return ret_value;
+}
+
+
+/****if* H5Af/h5aget_space_c
+ * NAME
+ *        h5aget_space_c
+ * PURPOSE
+ *     Call H5Aget_space to get attribute's dataspace
+ * INPUTS
+ *      attr_id - attribute identifier
+ * OUTPUTS
+ *     space_id - dataspace identifier
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ *
+ * SOURCE
+*/
+int_f
+nh5aget_space_c (hid_t_f *attr_id, hid_t_f *space_id)
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+     /*
+      * Call H5Aget_space function.
+      */
+     if ((*space_id = (hid_t_f)H5Aget_space((hid_t)*attr_id)) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+     return ret_value;
+}
+
+/****if* H5Af/h5aget_type_c
+ * NAME
+ *        h5aget_type_c
+ * PURPOSE
+ *     Call H5Aget_space to get attribute's datatype
+ * INPUTS
+ *      attr_id - attribute identifier
+ * OUTPUTS
+ *     type_id - datatype identifier
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  Elena Pourmal
+ *              Thursday, August 12, 1999
+ * HISTORY
+ *
+ * SOURCE
+*/
+int_f
+nh5aget_type_c (hid_t_f *attr_id, hid_t_f *type_id)
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+     /*
+      * Call H5Aget_type function.
+      */
+     if ((*type_id = (hid_t_f)H5Aget_type((hid_t)*attr_id)) < 0)
+         HGOTO_DONE(FAIL);
+
+done:
+     return ret_value;
+}
+
 /****if* H5Af/h5aget_num_attrs_c
  * NAME
- *  h5aget_num_attrs_c
+ *        h5aget_num_attrs_c
  * PURPOSE
- *  Call H5Oget_info to determine number of
- *  attributes of an object
+ *     Call H5Oget_info to determine number of
+ *              attributes of an object
  * INPUTS
- *  obj_id - object identifier
- *  attr_num - number of attributes
+ *      obj_id - object identifier
+ *              attr_num - number of attributes
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 12, 1999
+ *              Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num)
+nh5aget_num_attrs_c (hid_t_f *obj_id, int_f *attr_num)
 /******/
 {
     H5O_info_t oinfo;           /* Object info */
@@ -157,25 +1130,25 @@ done:
 
 /****if* H5Af/h5aget_name_c
  * NAME
- *  h5aget_name_c
+ *        h5aget_name_c
  * PURPOSE
- *  Call H5Aget_name to get attribute's name
+ *     Call H5Aget_name to get attribute's name
  * INPUTS
- *  attr_id - attribute identifier
- *  bufsize - size of the buffer
+ *      attr_id - attribute identifier
+ *              bufsize - size of the buffer
  * OUTPUTS
- *  buf - buffer to hold the name
+ *     buf - buffer to hold the name
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  Elena Pourmal
- *  Thursday, August 12, 1999
+ *              Thursday, August 12, 1999
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
+nh5aget_name_c(hid_t_f *attr_id, size_t_f *bufsize, _fcd buf)
 /******/
 {
   size_t c_bufsize;
@@ -206,36 +1179,99 @@ done:
   return ret_value;
 }
 
+/****if* H5Af/h5aget_storage_size_c
+ * NAME
+ *        h5aget_storage_size_c
+ * PURPOSE
+ *     Call H5Aget_storage_size
+ * INPUTS
+ *      attr_id - identifier of an attribute
+ * OUTPUTS
+ *     size    - attributes storage requirements
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *              January, 2008
+ * HISTORY
+ * N/A
+ * SOURCE
+*/
+
+int_f
+nh5aget_storage_size_c ( hid_t_f *attr_id,  hsize_t_f *size)
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+    if ((*size = (hsize_t_f)H5Aget_storage_size((hid_t)*attr_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
+
+/****if* H5Af/h5aget_create_plist_c
+ * NAME
+ *        h5aget_create_plist_c
+ * PURPOSE
+ *     Call H5Aget_create_plist
+ * INPUTS
+ *      attr_id - identifier of an attribute
+ * OUTPUTS
+ *     creation_prop_id - Identifier for the attribute’s creation property
+ * RETURNS
+ *     0 on success, -1 on failure
+ * AUTHOR
+ *  M. Scot Breitenfeld
+ *              January, 2008
+ * HISTORY
+ * N/A
+ * SOURCE
+*/
+
+int_f
+nh5aget_create_plist_c ( hid_t_f *attr_id,  hid_t_f *creation_prop_id)
+/******/
+{
+    int_f ret_value=0;          /* Return value */
+
+    if ((*creation_prop_id = (hid_t_f)H5Aget_create_plist((hid_t)*attr_id)) < 0)
+        HGOTO_DONE(FAIL);
+
+done:
+    return ret_value;
+}
 
 /****if* H5Af/h5arename_by_name_c
  * NAME
- *  h5arename_by_name_c
+ *      h5arename_by_name_c
  * PURPOSE
- *  Calls H5Arename_by_name
+ *   Calls H5Arename_by_name
  * INPUTS
- *  loc_id        - Object identifier
- *  obj_name      - Name of object, relative to location,
- *  whose attribute is to be renamed
- *  obj_name_len      - Object name length
- *  old_attr_name     - Prior attribute name
- *  old_attr_name_len - Prior attribute name length
- *  new_attr_name     - New attribute name
- *  new_attr_name_len - New attribute name length
- *  lapl_id       - Link access property list identifier
+ *    loc_id        - Object identifier
+ *            obj_name      - Name of object, relative to location,
+ *                             whose attribute is to be renamed
+ *            obj_name_len      - Object name length
+ *            old_attr_name     - Prior attribute name
+ *            old_attr_name_len - Prior attribute name length
+ *            new_attr_name     - New attribute name
+ *            new_attr_name_len - New attribute name length
+ *            lapl_id       - Link access property list identifier
  * OUTPUTS
  *     N/A
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 
 int_f
-h5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5arename_by_name_c( hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
 		      _fcd new_attr_name, size_t_f *new_attr_namelen,
 		      hid_t_f *lapl_id )
@@ -270,27 +1306,27 @@ done:
 
 /****if* H5Af/h5aopen_c
  * NAME
- *  h5aopen_c
+ *        h5aopen_c
  * PURPOSE
- *  Call H5Aopen to open an attribute
+ *     Call H5Aopen to open an attribute
  * INPUTS
- *  obj_id       - Identifer for object to which attribute is attached
+ *      obj_id       - Identifer for object to which attribute is attached
  *	        attr_name    - Attribute access property list
- *  attr_namelen - size of attr_name
- *  aapl_id      - Link access property list
+ *              attr_namelen - size of attr_name
+ *              aapl_id      - Link access property list
  * OUTPUTS
- *  attr_id - dataset identifier
+ *     attr_id - dataset identifier
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5aopen_c (hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *attr_id)
+nh5aopen_c (hid_t_f *obj_id, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *aapl_id, hid_t_f *attr_id)
 /******/
 {
     char *c_attr_name = NULL;          /* Buffer to hold C string */
@@ -315,30 +1351,30 @@ done:
 }
 /****if* H5Af/h5adelete_by_name_c
  * NAME
- *  h5adelete_by_name_c
+ *        h5adelete_by_name_c
  * PURPOSE
- *  Call h5adelete_by_name to remove an attribute from a specified location
+ *     Call h5adelete_by_name to remove an attribute from a specified location
  * INPUTS
- *  loc_id - identifer for object to which attribute is attached
- *  obj_name - object identifier
- *  obj_namelen - name length
- *  attr_name - name of the attribute
- *  attr_namelen - name length
- *  lapl_id - link access property list
+ *      loc_id - identifer for object to which attribute is attached
+ *              obj_name - object identifier
+ *              obj_namelen - name length
+ *              attr_name - name of the attribute
+ *              attr_namelen - name length
+ *              lapl_id - link access property list
  *
  * OUTPUTS
  *     N/A
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id)
+nh5adelete_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id)
 /******/
 {
     char *c_obj_name = NULL;          /* Buffer to hold C string */
@@ -368,30 +1404,30 @@ done:
 }
 /****if* H5Af/h5adelete_by_idx_c
  * NAME
- *  h5adelete_by_idx_c
+ *        h5adelete_by_idx_c
  * PURPOSE
- *  Call h5adelete_by_idx
+ *     Call h5adelete_by_idx
  * INPUTS
- *  loc_id - Location or object identifier; may be dataset or group
- *  obj_name - object identifier
- *  obj_namelen - name length
- *  attr_name - name of the attribute
- *  attr_namelen - name length
- *  lapl_id - link access property list
+ *      loc_id - Location or object identifier; may be dataset or group
+ *              obj_name - object identifier
+ *              obj_namelen - name length
+ *              attr_name - name of the attribute
+ *              attr_namelen - name length
+ *              lapl_id - link access property list
  *
  * OUTPUTS
  *     N/A
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5adelete_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		     int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id)
 /******/
 {
@@ -418,50 +1454,50 @@ done:
 }
 /****if* H5Af/h5aget_name_by_idx_c
  * NAME
- *  h5aget_name_by_idx_c
+ *        h5aget_name_by_idx_c
  * PURPOSE
- *  Call h5aget_name_by_idx
+ *     Call h5aget_name_by_idx
  * INPUTS
  *
  *
- *  loc_id - Identifer for object to which attribute is attached
- *  obj_name - Name of object, relative to location,
- *  from which attribute is to be removed *TEST* check NULL
- *  idx_type - Type of index; Possible values are:
+ *        loc_id - Identifer for object to which attribute is attached
+ *      obj_name - Name of object, relative to location,
+ *                  from which attribute is to be removed *TEST* check NULL
+ *      idx_type - Type of index; Possible values are:
  *                         H5_INDEX_UNKNOWN   - Unknown index type
  *                         H5_INDEX_NAME      - Index on names
  *                         H5_INDEX_CRT_ORDER - Index on creation order
  *                         H5_INDEX_N	      - Number of indices defined
  *
- *  order    - Order in which to iterate over index; Possible values are:
+ *      order    - Order in which to iterate over index; Possible values are:
  *                          H5_ITER_UNKNOWN  - Unknown order
  *                          H5_ITER_INC      - Increasing order
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
  *
- *  n  - Attribute’s position in index
- *  attr_id  - Attribute identifier
- *  size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
+ *            n  - Attribute’s position in index
+ *      attr_id  - Attribute identifier
+ *         size  - Buffer size ! *TEST* check for 0 value *CHECK* should this return the correct value
  *
- *  lapl_id   - Link access property list
- *  hdferr   - Error code:
- *  Returns attribute name size, -1 if fail
+ *     lapl_id   - Link access property list
+ *      hdferr   - Error code:
+ *                            Returns attribute name size, -1 if fail
  *
  * OUTPUTS
- *  name - Attribute name
+ *     name - Attribute name
  *
  * RETURNS
- *  Size of buffer on success, -1 on failure
+ *     Size of buffer on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5aget_name_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		       int_f *idx_type, int_f *order, hsize_t_f *n, _fcd name,
 		       size_t_f *size, hid_t_f *lapl_id)
 /******/
@@ -509,42 +1545,42 @@ done:
 
 /****if* H5Af/h5aopen_by_idx_c
  * NAME
- *  h5aopen_by_idx_c
+ *        h5aopen_by_idx_c
  * PURPOSE
- *  Call H5Aopen_by_idx
+ *     Call H5Aopen_by_idx
  * INPUTS
- *  loc_id    - Object identifier
- *  obj_name - Name of object to which attribute is attached
- *  obj_namelen - name length
- *  idx_type - Type of index; Possible values are:
+ *   loc_id    - Object identifier
+ *            obj_name - Name of object to which attribute is attached
+ *         obj_namelen - name length
+ *            idx_type - Type of index; Possible values are:
  *                         H5_INDEX_UNKNOWN   - Unknown index type
  *                         H5_INDEX_NAME      - Index on names
  *                         H5_INDEX_CRT_ORDER - Index on creation order
  *                         H5_INDEX_N	      - Number of indices defined
  *
- *  order - Order in which to iterate over index; Possible values are:
+ *               order - Order in which to iterate over index; Possible values are:
  *                          H5_ITER_UNKNOWN  - Unknown order
  *                          H5_ITER_INC      - Increasing order
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
  *
- *  n - Attribute’s position in index
- *  aapl_id - Attribute access property list
- *  lapl_id - Link access property list
+ *                   n - Attribute’s position in index
+ *             aapl_id - Attribute access property list
+ *             lapl_id - Link access property list
  * OUTPUTS
- *  attr_id - attribute identifer
+ *    attr_id - attribute identifer
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5aopen_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		   int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id )
 /******/
 {
@@ -572,29 +1608,29 @@ done:
 
 /****if* H5Af/h5aget_info_c
  * NAME
- *  h5aget_info_c
+ *        h5aget_info_c
  * PURPOSE
- *  Call H5Aget_info
+ *     Call H5Aget_info
  * INPUTS
- *  loc_id  - Object identifier
+ *     loc_id  - Object identifier
  * OUTPUTS
  *
- *  corder_valid - Indicates whether the the creation order data is valid for this attribute
- *  corder - Is a positive integer containing the creation order of the attribute
- *  cset - Indicates the character set used for the attribute’s name
- *  data_size - indicates the size, in the number of characters, of the attribute
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
+nh5aget_info_c (hid_t_f *loc_id, int_f *corder_valid, int_f *corder,
 		int_f *cset, hsize_t_f *data_size )
 /******/
 {
@@ -624,46 +1660,46 @@ done:
 
 /****if* H5Af/h5aget_info_by_idx_c
  * NAME
- *  h5aget_info_by_idx_c
+ *        h5aget_info_by_idx_c
  * PURPOSE
- *  Call  H5Aget_info_by_idx
+ *     Call  H5Aget_info_by_idx
  * INPUTS
- *  loc_id  - Object identifier
- *  obj_name - Name of object to which attribute is attached
- *  obj_namelen - name length
- *  idx_type - Type of index; Possible values are:
+ *    loc_id  - Object identifier
+ *            obj_name - Name of object to which attribute is attached
+ *         obj_namelen - name length
+ *            idx_type - Type of index; Possible values are:
  *                         H5_INDEX_UNKNOWN   - Unknown index type
  *                         H5_INDEX_NAME      - Index on names
  *                         H5_INDEX_CRT_ORDER - Index on creation order
  *                         H5_INDEX_N	      - Number of indices defined
  *
- *  order - Order in which to iterate over index; Possible values are:
+ *               order - Order in which to iterate over index; Possible values are:
  *                          H5_ITER_UNKNOWN  - Unknown order
  *                          H5_ITER_INC      - Increasing order
  *                          H5_ITER_DEC      - Decreasing order
  *                          H5_ITER_NATIVE   - No particular order, whatever is fastest
  *                          H5_ITER_N	     - Number of iteration orders
  *
- *  n - Attribute’s position in index
- *  lapl_id - Link access property list
+ *                   n - Attribute’s position in index
+ *             lapl_id - Link access property list
  * OUTPUTS
  *
- *  corder_valid - Indicates whether the the creation order data is valid for this attribute
- *  corder - Is a positive integer containing the creation order of the attribute
- *  cset - Indicates the character set used for the attribute’s name
- *  data_size - indicates the size, in the number of characters, of the attribute
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5aget_info_by_idx_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		int_f *idx_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id,
 		int_f *corder_valid, int_f *corder,
 		int_f *cset, hsize_t_f *data_size )
@@ -703,34 +1739,34 @@ done:
 
 /****if* H5Af/h5aget_info_by_name_c
  * NAME
- *  h5aget_info_by_name_c
+ *        h5aget_info_by_name_c
  * PURPOSE
- *  Call  H5Aget_info_by_name
+ *     Call  H5Aget_info_by_name
  * INPUTS
- *  loc_id - Object identifier
- *  obj_name - Name of object to which attribute is attached
- *  obj_namelen - name length
- *  attr_name - Attribute name
- *  attr_namelen - attribute name length
- *  lapl_id - Link access property list
+ *      loc_id - Object identifier
+ *            obj_name - Name of object to which attribute is attached
+ *         obj_namelen - name length
+ *           attr_name - Attribute name
+ *        attr_namelen - attribute name length
+ *             lapl_id - Link access property list
  * OUTPUTS
  *
- *  corder_valid - Indicates whether the the creation order data is valid for this attribute
- *  corder - Is a positive integer containing the creation order of the attribute
- *  cset - Indicates the character set used for the attribute’s name
- *  data_size - indicates the size, in the number of characters, of the attribute
+ *        corder_valid - Indicates whether the the creation order data is valid for this attribute
+ *              corder - Is a positive integer containing the creation order of the attribute
+ *                cset - Indicates the character set used for the attribute’s name
+ *           data_size - indicates the size, in the number of characters, of the attribute
  *
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5aget_info_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 			_fcd attr_name, size_t_f *attr_namelen, hid_t_f *lapl_id,
 			int_f *corder_valid, int_f *corder,
 			int_f *cset, hsize_t_f *data_size )
@@ -774,38 +1810,38 @@ done:
 
 /****if* H5Af/h5acreate_by_name_c
  * NAME
- *  h5acreate_by_name_c
+ *        h5acreate_by_name_c
  * PURPOSE
- *  Call h5acreate_by_name
+ *     Call h5acreate_by_name
 
  * INPUTS
  *
- *  loc_id  - Object identifier
- *  obj_name - Name of object to which attribute is attached
- *  obj_namelen - name length
- *  attr_name - Attribute name
- *  attr_namelen - attribute name length
- *  type_id - Attribute datatype identifier
- *  space_id  - Attribute dataspace identifier
- *  acpl_id - Attribute creation property list identifier (Currently not used.)
- *  aapl_id - Attribute access property list identifier (Currently not used.)
- *  lapl_id - Link access property list
+ *         loc_id  - Object identifier
+ *        obj_name - Name of object to which attribute is attached
+ *     obj_namelen - name length
+ *       attr_name - Attribute name
+ *    attr_namelen - attribute name length
+ *         type_id - Attribute datatype identifier
+ *       space_id  - Attribute dataspace identifier
+ *         acpl_id - Attribute creation property list identifier (Currently not used.)
+ *         aapl_id - Attribute access property list identifier (Currently not used.)
+ *         lapl_id - Link access property list
  *
  * OUTPUTS
  *
- *  attr - an attribute identifier
+ *            attr - an attribute identifier
  *
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  February, 2008
+ *              February, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 int_f
-h5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
+nh5acreate_by_name_c(hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen,
 		     _fcd attr_name, size_t_f *attr_namelen,  hid_t_f *type_id,
 		     hid_t_f *space_id, hid_t_f *acpl_id, hid_t_f *aapl_id,
 		     hid_t_f *lapl_id, hid_t_f *attr_id )
@@ -840,27 +1876,27 @@ done:
 
 /****if* H5Af/h5aexists_c
  * NAME
- *  h5aexists_c
+ *        h5aexists_c
  * PURPOSE
  *     CAll h5aexists
  * INPUTS
  *
- *  obj_id - Object identifier
- *  attr_name - Attribute name
+ *             obj_id - Object identifier
+ *          attr_name - Attribute name
  * OUTPUTS
  *
- *  attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ *     attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  February, 2008
+ *              February, 2008
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists)
+nh5aexists_c (hid_t_f *obj_id, _fcd name, size_t_f *namelen, hid_t_f *attr_exists)
 /******/
 {
   char *c_name = NULL;          /* Buffer to hold C string */
@@ -886,29 +1922,29 @@ done:
 
 /****if* H5Af/h5aexists_by_name_c
  * NAME
- *  h5aexists_by_name_c
+ *        h5aexists_by_name_c
  * PURPOSE
  *     CAll H5Aexists_by_name
  * INPUTS
  *
- *  loc_id - Location identifier
- *  obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+ *     loc_id - Location identifier
+ *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
  *  attr_name - Attribute name
- *  lapl_id - Link access property list identifier
+ *    lapl_id - Link access property list identifier
  * OUTPUTS
  *
- *  attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
+ *     attr_exists_c  - returns a positive value, for TRUE, or 0 (zero), for FALSE.
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  February, 2008
+ *              February, 2008
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
+nh5aexists_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
 		      hid_t_f *lapl_id, int_f *attr_exists)
 /******/
 {
@@ -940,30 +1976,30 @@ done:
 
 /****if* H5Af/h5aopen_by_name_c
  * NAME
- *  h5aopen_by_name_c
+ *        h5aopen_by_name_c
  * PURPOSE
- *  Call H5Aopen_by_name
+ *     Call H5Aopen_by_name
  * INPUTS
  *
- *  loc_id - Location identifier
- *  obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
+ *     loc_id - Location identifier
+ *   obj_name - Object name either relative to loc_id, absolute from the file’s root group, or '.' (a dot)
  *  attr_name - Attribute name
- *  aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
- *  lapl_id - Link access property list identifier
+ *    aapl_id - Attribute access property list (Currently unused; should be passed in as H5P_DEFAULT.)
+ *    lapl_id - Link access property list identifier
  * OUTPUTS
  *
- *  attr_id  - attribute identifier
+ *     attr_id  - attribute identifier
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  February, 2008
+ *              February, 2008
  * HISTORY
  *
  * SOURCE
 */
 int_f
-h5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
+nh5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd attr_name, size_t_f *attr_namelen,
 		    hid_t_f *aapl_id, hid_t_f *lapl_id, hid_t_f *attr_id)
 /******/
 {
@@ -995,29 +2031,29 @@ h5aopen_by_name_c (hid_t_f *loc_id, _fcd obj_name, size_t_f *obj_namelen, _fcd a
 
 /****if* H5Af/h5arename_c
  * NAME
- *  h5arename_c
+ *      h5arename_c
  * PURPOSE
- *  Calls H5Arename
+ *   Calls H5Arename
  * INPUTS
- *  loc_id            - Object identifier
- *  old_attr_name     - Prior attribute name
- *  old_attr_name_len - Prior attribute name length
- *  new_attr_name     - New attribute name
- *  new_attr_name_len - New attribute name length
+ *    loc_id            - Object identifier
+ *            old_attr_name     - Prior attribute name
+ *            old_attr_name_len - Prior attribute name length
+ *            new_attr_name     - New attribute name
+ *            new_attr_name_len - New attribute name length
  * OUTPUTS
  *     N/A
  * RETURNS
- *  0 on success, -1 on failure
+ *     0 on success, -1 on failure
  * AUTHOR
  *  M. Scot Breitenfeld
- *  January, 2008
+ *              January, 2008
  * HISTORY
  * N/A
  * SOURCE
 */
 
 int_f
-h5arename_c( hid_t_f *loc_id,
+nh5arename_c( hid_t_f *loc_id,
 		      _fcd old_attr_name, size_t_f *old_attr_namelen,
 		      _fcd new_attr_name, size_t_f *new_attr_namelen)
 /******/