Cleanups and normalizations against incoming page_buffering changes.

3 files changed, 23 insertions, 15 deletions

diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index befcaca..7e12869 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1151,14 +1151,18 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 
     ALL_MEMBERS(mt) {
         out_mt = mt;
-	if (f1->memb[mt] && f2->memb[mt]) break;
-	if (!cmp) {
-	    if (f1->memb[mt]) cmp = -1;
-	    else if (f2->memb[mt]) cmp = 1;
+	if(f1->memb[mt] && f2->memb[mt])
+            break;
+	if(!cmp) {
+	    if(f1->memb[mt])
+                cmp = -1;
+	    else if(f2->memb[mt])
+                cmp = 1;
 	}
     } END_MEMBERS;
     assert(cmp || out_mt<H5FD_MEM_NTYPES);
-    if (out_mt>=H5FD_MEM_NTYPES) return cmp;
+    if(out_mt>=H5FD_MEM_NTYPES)
+        return cmp;
 
     return H5FDcmp(f1->memb[out_mt], f2->memb[out_mt]);
 }
diff --git a/src/H5Fint.c b/src/H5Fint.c
index 4783a36..ada0e96 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -869,7 +869,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
         } /* end if */
 
         /* With the shutdown modifications, the contents of the metadata cache
-         * should be clean at this point, with the possible exception of the 
+         * should be clean at this point, with the possible exception of the
          * the superblock and superblock extension.
          *
          * Verify this.
@@ -892,18 +892,21 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
              *      (assuming they are persistent).  In this case, closing the
              *      free space managers should have no effect on EOA.
              *
-             *                                          -- JRM 
+             *                                          -- JRM
              */
             if(H5F_ACC_RDWR & H5F_INTENT(f)) {
                 if(H5MF_close(f, dxpl_id) < 0)
                     /* Push error, but keep going*/
                     HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "can't release file free space info")
 
-                /* at this point, only the superblock and superblock 
+                /* at this point, only the superblock and superblock
                  * extension should be dirty.
                  */
                 HDassert(H5AC_cache_is_clean(f, H5AC_RING_MDFSM));
 
+                /* Flush the file again (if requested), as shutting down the
+                 * free space manager may dirty some data structures again.
+                 */
                 if(flush) {
 		    /* Clear status_flags */
                     f->shared->sblock->status_flags &= (uint8_t)(~H5F_SUPER_WRITE_ACCESS);
@@ -918,7 +921,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
                      * so that the eoa value corresponds to the end of the 
                      * space written to in the file.
                      *
-                     * At most, this should change the superblock or the 
+                     * At most, this should change the superblock or the
                      * superblock extension messages.
                      */
                     if(H5MF_free_aggrs(f, dxpl_id) < 0)
@@ -930,7 +933,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
                         /* Push error, but keep going*/
                         HDONE_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "low level truncate failed")
 
-                    /* at this point, only the superblock and superblock 
+                    /* at this point, only the superblock and superblock
                      * extension should be dirty.
                      */
                     HDassert(H5AC_cache_is_clean(f, H5AC_RING_MDFSM));
@@ -952,7 +955,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
             f->shared->sblock = NULL;
         } /* end if */
 
-        /* with the possible exception of the superblock and superblock 
+        /* with the possible exception of the superblock and superblock
          * extension, the metadata cache should be clean at this point.
          *
          * Verify this.
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index 9cdebc8..1510645 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -232,9 +232,9 @@ haddr_t
 H5MF_aggr_alloc(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr,
     H5F_blk_aggr_t *other_aggr, H5FD_mem_t type, hsize_t size)
 {
-    haddr_t	eoa_frag_addr = HADDR_UNDEF;    /* Address of fragment at EOA */
-    hsize_t	eoa_frag_size = 0;      /* Size of fragment at EOA */
-    haddr_t	eoa = HADDR_UNDEF;      /* Initial EOA for the file */
+    haddr_t     eoa_frag_addr = HADDR_UNDEF;    /* Address of fragment at EOA */
+    hsize_t     eoa_frag_size = 0;      	/* Size of fragment at EOA */
+    haddr_t	eoa = HADDR_UNDEF;      	/* Initial EOA for the file */
     haddr_t     ret_value = HADDR_UNDEF;        /* Return value */
 
     FUNC_ENTER_NOAPI(HADDR_UNDEF)
@@ -543,7 +543,8 @@ H5MF_aggr_try_extend(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr,
 		    } /* end else-if */
 		} /* end else */
 	    } /* end if */
-            else { /* The aggreator is not at end of file */
+            else {
+                /* The aggreator is not at end of file */
                 /* Check if aggregator has enough internal space to satisfy the extension. */
                 if(aggr->size >= extra_requested) {
                     /* Extend block into aggregator */