[svn-r6497] Purpose:

    Finish code cleanup

Description:
    Wrap up the conversion of H5F_flush's multiple boolean flags into a single
bitfield of flags by pushing the flags down into the H5AC_flush and
H5F_istore_flush routines.
    Also, changed the flags from H5_FLUSH_<foo> to H5F_FLUSH_<foo> to be more
consistent with rest of library.
    And reverted the changes to H5FDflush and H5FD_flush routines.

Platforms tested:
    FreeBSD 4.7 (sleipnir)
    Solaris 5.8 (sol)
    IRIX64 6.5 (modi4) w/parallel

Misc. update:

1 files changed, 4 insertions, 11 deletions

diff --git a/src/H5FD.c b/src/H5FD.c
index 4c01663..3fe75cc 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -3202,7 +3202,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data transfer property list");
 
     /* Do the real work */
-    if (H5FD_flush(file, dxpl_id, closing ? H5_FLUSH_CLOSING : H5_FLUSH_NONE) < 0)
+    if (H5FD_flush(file,dxpl_id,closing)<0)
 	HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "file flush request failed");
 
 done:
@@ -3226,14 +3226,10 @@ done:
  *              Quincey Koziol, May 20, 2002
  *              Added 'closing' parameter
  *
- *              Bill Wendling, March 18, 2003
- *              Changed closing flag to FLAGS so that more than just one
- *              can be supported.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned flags)
+H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
@@ -3252,11 +3248,8 @@ H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned flags)
         file->accum_dirty=FALSE;
     } /* end if */
 
-    if ((flags & H5_FLUSH_CLEAR_ONLY) == 0)
-        /* Flush only if we're not clearing the dirty bits in the caches */
-        if (file->cls->flush &&
-                (file->cls->flush)(file, dxpl_id, flags & H5_FLUSH_CLOSING)<0)
-            HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver flush request failed");
+    if (file->cls->flush && (file->cls->flush)(file,dxpl_id,closing)<0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver flush request failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);