[svn-r18032] Description:

	Bring r18031 from trunk to 1.8 branch:

	Bring r18030 from merge_metadata_journaling branch to trunk:

	Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.

	Also, some other minor cleanups along the way.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
	(h5committested on trunk)

1 files changed, 10 insertions, 43 deletions

diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index f711fda..adc9be9 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -118,13 +118,6 @@ H5FL_SEQ_EXTERN(H5G_entry_t);
  *		matzke@llnl.gov
  *		Jun 23 1997
  *
- * Modifications:
- *		Robb Matzke, 1999-07-28
- *		The ADDR argument is passed by value.
- *
- *	Quincey Koziol, 2002-7-180
- *	Added dxpl parameter to allow more control over I/O from metadata
- *      cache.
  *-------------------------------------------------------------------------
  */
 static H5G_node_t *
@@ -222,26 +215,6 @@ done:
  *		matzke@llnl.gov
  *		Jun 23 1997
  *
- * Modifications:
- *              rky, 1998-08-28
- *		Only p0 writes metadata to disk.
- *
- * 		Robb Matzke, 1999-07-28
- *		The ADDR argument is passed by value.
- *
- *	Quincey Koziol, 2002-7-180
- *	Added dxpl parameter to allow more control over I/O from metadata
- *      cache.
- *
- *      Pedro Vicente, <pvn@ncsa.uiuc.edu> 18 Sep 2002
- *      Added `id to name' support.
- *
- *      JRM -- 8/21/06
- *      Added the flags_ptr parameter.  This parameter exists to
- *      allow the flush routine to report to the cache if the
- *      entry is resized or renamed as a result of the flush.
- *      *flags_ptr is set to H5C_CALLBACK__NO_FLAGS_SET on entry.
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -349,8 +322,6 @@ done:
  *		koziol@ncsa.uiuc.edu
  *		Jan 15 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -383,7 +354,7 @@ H5G_node_dest(H5F_t *f, H5G_node_t *sym)
     /* Release resources */
     if(sym->entry)
         sym->entry = (H5G_entry_t *)H5FL_SEQ_FREE(H5G_entry_t, sym->entry);
-    (void)H5FL_FREE(H5G_node_t, sym);
+    sym = H5FL_FREE(H5G_node_t, sym);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -401,8 +372,6 @@ done:
  *		koziol@ncsa.uiuc.edu
  *		Mar 20 2003
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -411,28 +380,28 @@ H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
     unsigned u;              /* Local index variable */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5G_node_clear);
+    FUNC_ENTER_NOAPI_NOINIT(H5G_node_clear)
 
     /*
      * Check arguments.
      */
-    assert(sym);
+    HDassert(sym);
 
     /* Look for dirty entries and reset their dirty flag.  */
     for(u = 0; u < sym->nsyms; u++)
-        sym->entry[u].dirty=FALSE;
+        sym->entry[u].dirty = FALSE;
     sym->cache_info.is_dirty = FALSE;
 
     /*
      * Destroy the symbol node?	 This might happen if the node is being
      * preempted from the cache.
      */
-    if (destroy)
-        if (H5G_node_dest(f, sym) < 0)
-	    HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node");
+    if(destroy)
+        if(H5G_node_dest(f, sym) < 0)
+	    HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_node_clear() */
 
 
@@ -448,14 +417,12 @@ done:
  * Programmer:	John Mainzer
  *		5/13/04
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5G_node_size(const H5F_t *f, const H5G_node_t UNUSED *sym, size_t *size_ptr)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_size);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_size)
 
     /*
      * Check arguments.
@@ -465,6 +432,6 @@ H5G_node_size(const H5F_t *f, const H5G_node_t UNUSED *sym, size_t *size_ptr)
 
     *size_ptr = H5G_node_size_real(f);
 
-    FUNC_LEAVE_NOAPI(SUCCEED);
+    FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5G_node_size() */