[svn-r14903] Undoing change committed in r14902.

1 files changed, 9 insertions, 52 deletions

diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 49f8266..929a056 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -30,13 +30,10 @@
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, August 4, 1999
- * Modifications: 
- *               - Added optional parameters introduced in version 1.8
- *                 February, 2008
+ * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-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)
+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 *crt_prp,  hid_t_f *dset_id)
 {
      char *c_name = NULL;
      hid_t c_dset_id;
@@ -51,8 +48,7 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_
      /*
       * Call H5Dcreate2 function.
       */
-     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, 
-				(hid_t)*lcpl_id, (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
+     if((c_dset_id = H5Dcreate2((hid_t)*loc_id, c_name, (hid_t)*type_id, (hid_t)*space_id, H5P_DEFAULT, (hid_t)*crt_prp, H5P_DEFAULT)) < 0)
          goto DONE;
      *dset_id = (hid_t_f)c_dset_id;
 
@@ -70,15 +66,14 @@ DONE:
  * Inputs:      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
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Wednesday, August 4, 1999
- * Modifications: Added 1.8 parameter: dapl_id
+ * Modifications:
  *---------------------------------------------------------------------------*/
 int_f
-nh5dopen_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 *dset_id)
 {
      char *c_name = NULL;
      hid_t c_dset_id;
@@ -93,7 +88,7 @@ nh5dopen_c(hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dapl_id, hid_t_f
      /*
       * Call H5Dopen2 function.
       */
-     if((c_dset_id = H5Dopen2((hid_t)*loc_id, c_name, (hid_t)*dapl_id)) < 0)
+     if((c_dset_id = H5Dopen2((hid_t)*loc_id, c_name, H5P_DEFAULT)) < 0)
          goto DONE;
 
      *dset_id = (hid_t_f)c_dset_id;
@@ -1262,21 +1257,18 @@ nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id)
 
 
 /*----------------------------------------------------------------------------
- * Name:        h5dset_extent_c
+ * Name:        h5dextend_c
  * Purpose:     Call H5Dset_extent to extend dataset with unlimited dimensions
  * Inputs:      dset_id - identifier of the dataset
  * Outputs:     dims - array with the dimension sizes
  * Returns:     0 on success, -1 on failure
  * Programmer:  Elena Pourmal
  *              Thursday, August 19, 1999
- *
- * Modifications: Changed name from the now obsolete h5dextend
- *                to h5dset_extent in order to match new fortran interface.
- *                -MSB- March 14, 2008
+ * Modifications:
  *---------------------------------------------------------------------------*/
 
 int_f
-nh5dset_extent_c ( hid_t_f *dset_id , hsize_t_f *dims)
+nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims)
 {
   hid_t c_space_id;
   hsize_t c_dims[H5S_MAX_RANK];
@@ -1954,39 +1946,4 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag)
      ret_value = 0;
      return ret_value;
 }
-/*----------------------------------------------------------------------------
- * Name:        h5dcreate_anon_c
- * Purpose:     Call H5Dcreate_anon
- * Inputs:
- *		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.    
- * Outputs:     
- *              dset_id - dataset identifier
- *
- * Returns:     0 on success, -1 on failure
- * Programmer:  M.S. Breitenfeld
- *              February, 2008
- *---------------------------------------------------------------------------*/
-int_f
-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)
-{
-  int ret_value = -1;
-  
-  /*
-   * Call H5Dcreate2 function.
-   */
-  if((*dset_id = (hid_t_f)H5Dcreate_anon((hid_t)*loc_id, (hid_t)*type_id, (hid_t)*space_id, 
-					 (hid_t)*dcpl_id, (hid_t)*dapl_id)) < 0)
-    goto DONE;
-  
-  ret_value = 0;
-
- DONE:
-  return ret_value;
-}
-