[svn-r27241] Bring revisions #27058 - #27072 from trunk to revise_chunks. h5committested.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index d6d16ba..022ba5f 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -299,16 +299,15 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  * 		dirtied while protected.
  *
  * 		This field is set to FALSE in the protect call, and may
- * 		be set to TRUE by the
- * 		H5C_mark_entry_dirty()
- * 		call at an time prior to the unprotect call.
+ * 		be set to TRUE by the H5C_mark_entry_dirty() call at any 
+ *		time prior to the unprotect call.
  *
- * 		The H5C_mark_entry_dirty() call exists
- * 		as a convenience function for the fractal heap code which
- * 		may not know if an entry is protected or pinned, but knows
- * 		that is either protected or pinned.  The dirtied field was
- * 		added as in the parallel case, it is necessary to know
- * 		whether a protected entry was dirty prior to the protect call.
+ * 		The H5C_mark_entry_dirty() call exists as a convenience 
+ *		function for the fractal heap code which may not know if 
+ *		an entry is protected or pinned, but knows that is either 
+ *		protected or pinned.  The dirtied field was added as in 
+ *		the parallel case, it is necessary to know whether a 
+ *		protected entry is dirty prior to the protect call.
  *
  * is_protected: Boolean flag indicating whether this entry is protected
  *		(or locked, to use more conventional terms).  When it is
@@ -379,21 +378,22 @@ typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
  *		the entry is flushed for whatever reason.
  *
  * flush_me_last:  Boolean flag indicating that this entry should not be
- *                 flushed from the cache until all other entries without
- *                 the flush_me_last flag set have been flushed.
+ *		flushed from the cache until all other entries without
+ *              the flush_me_last flag set have been flushed.
  *
  * flush_me_collectively:  Boolean flag indicating that this entry needs
- *                         to be flushed collectively when in a parallel
- *                         situation.
+ *              to be flushed collectively when in a parallel situation.
  * 
- *      Note: At this time, the flush_me_last and flush_me_collectively
- *            flags will only be applied to one entry, the superblock,
- *            and the code utilizing these flags is protected with HDasserts
- *            to enforce this. This restraint can certainly be relaxed in
- *            the future if the the need for multiple entries getting flushed
- *            last or collectively arises, though the code allowing for that
- *            will need to be expanded and tested appropriately if that
- *            functionality is desired.
+ *		Note: 
+ *		
+ *		At this time, the flush_me_last and flush_me_collectively
+ *              flags will only be applied to one entry, the superblock,
+ *              and the code utilizing these flags is protected with HDasserts
+ *              to enforce this. This restraint can certainly be relaxed in
+ *              the future if the the need for multiple entries getting flushed
+ *              last or collectively arises, though the code allowing for that
+ *              will need to be expanded and tested appropriately if that
+ *              functionality is desired.
  *
  * clear_on_unprotect:  Boolean flag used only in PHDF5.  When H5C is used
  *		to implement the metadata cache In the parallel case, only
@@ -612,7 +612,7 @@ typedef struct H5C_cache_entry_t
 #ifdef H5_HAVE_PARALLEL
     hbool_t                     flush_me_collectively;
     hbool_t			clear_on_unprotect;
-    hbool_t		        flush_immediately;
+    hbool_t			flush_immediately;
 #endif /* H5_HAVE_PARALLEL */
     hbool_t			flush_in_progress;
     hbool_t			destroy_in_progress;
@@ -625,8 +625,8 @@ typedef struct H5C_cache_entry_t
     unsigned                    flush_dep_parent_nalloc;
     unsigned                    flush_dep_nchildren;
     unsigned                    flush_dep_ndirty_children;
-    hbool_t		pinned_from_client;
-    hbool_t		pinned_from_cache;
+    hbool_t			pinned_from_client;
+    hbool_t			pinned_from_cache;
 
     /* fields supporting the hash table: */