Merge pull request #52 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop

Merged evict-on-close feature from branch (via develop in cloned repo).

* commit 'cbc260e636e258cc55d9fb8fdafd3bff0877ac23': (21 commits)
  - Removed BRANCH.txt and MANIFEST entry - Fixed a missing line in H5Dint.c
  - Removed non-implemented code from H5Gint.c - Removed commented-out debug code from H5Dint.c - Added blank lines to eliminate delta in a fortran file.
  Added full implementation of EoC cache test.
  Added code to create the test file for all chunk index and layout types.
  Fleshed out evict on close test that inspects cache.
  Added the beginnings of a file generator to the test.
  Fixed typo
  Added "Purpose:" information to the API call comments for the new functions.
  Cleaned up feature for dissemination to LLNL:     - Removed support for datatypes.     - Commented out support for groups     - General change clean-up     - Added a list of improvements to BRANCH.txt
  Removed blank line in Fortran file (leftover from last commit)
  Reverted H5T code since datatypes will not be supported at this time.
  Fixed format_convert and fortran files (bad merge?).
  Updated manifest. Was missing BRANCH.txt.
  Added missing evict on close test file line to test/CMakeLists.txt.
  [svn-r30110] Added missing evict_on_close.c file to test/.
  [svn-r30108] Moved group flush and evict code to H5G_close from H5Gclose.
  [svn-r30107] Moved dataset flush and evict code to H5D_close from H5Dclose.
  [svn-r30106] Moved datatype close code to new internal function. H5Oclose() now supports evict-on-close for datatypes.
  [svn-r30105] Datatypes and Groups now support evict-on-close.
  [svn-r30084] First pass at the evict-on-close feature.
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 23397ad..44e4baa 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -308,37 +308,37 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Dclose
+ * Function:    H5Dclose
  *
- * Purpose:	Closes access to a dataset (DATASET_ID) and releases
- *		resources used by it. It is illegal to subsequently use that
- *		same dataset ID in calls to other dataset functions.
+ * Purpose:     Closes access to a dataset (DATASET_ID) and releases
+ *              resources used by it. It is illegal to subsequently use that
+ *              same dataset ID in calls to other dataset functions.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:      Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Thursday, December  4, 1997
+ * Programmer:  Robb Matzke
+ *              Thursday, December  4, 1997
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Dclose(hid_t dset_id)
 {
-    herr_t       ret_value = SUCCEED;   /* Return value */
+    herr_t  ret_value = SUCCEED;    /* Return value                     */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", dset_id);
 
     /* Check args */
     if(NULL == H5I_object_verify(dset_id, H5I_DATASET))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
     /*
      * Decrement the counter on the dataset.  It will be freed if the count
      * reaches zero.  
      */
     if(H5I_dec_app_ref_always_close(dset_id) < 0)
-	HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "can't decrement count on dataset ID")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTDEC, FAIL, "can't decrement count on dataset ID")
 
 done:
     FUNC_LEAVE_API(ret_value)