[svn-r17402] Description:

    Switch from using a 'flags' parameter to the flush routine(s), to just
using a single 'closing' boolean parameter, since that's all we're doing with
the flags anyway and this makes things more obvious.

Tested on:
    FreeBSD/32 6.3 (duty) in debug mode
    FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
    Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
        in debug mode
    Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
        w/C++ & FORTRAN, in production mode
    Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
        w/szip filter, in production mode
    Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
        in production mode
    Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
    Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
    Mac OS X/32 10.5.8 (amazon) in debug mode
    Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
        in production mode

1 files changed, 8 insertions, 8 deletions

diff --git a/src/H5Dint.c b/src/H5Dint.c
index 7bdf75d..8789289 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -48,7 +48,7 @@
 typedef struct {
     const H5F_t *f;             /* Pointer to file being flushed */
     hid_t dxpl_id;              /* DXPL for I/O operations */
-    unsigned flags;             /* Flags for flush operation */
+    hbool_t closing;            /* Whether the file is closing */
 } H5D_flush_ud_t;
 
 
@@ -66,7 +66,7 @@ static herr_t H5D_init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space)
 static herr_t H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset,
     hid_t dapl_id);
 static herr_t H5D_open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id);
-static herr_t H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags);
+static herr_t H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, hbool_t closing);
 
 
 /*********************/
@@ -1361,7 +1361,7 @@ H5D_close(H5D_t *dataset)
     dataset->shared->fo_count--;
     if(dataset->shared->fo_count == 0) {
         /* Flush the dataset's information */
-        if(H5D_flush_real(dataset, H5AC_dxpl_id, H5F_FLUSH_NONE) < 0)
+        if(H5D_flush_real(dataset, H5AC_dxpl_id, FALSE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info")
 
         /* Free the data sieve buffer, if it's been allocated */
@@ -2234,7 +2234,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
+H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, hbool_t closing)
 {
     H5O_t *oh = NULL;                   /* Pointer to dataset's object header */
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -2278,7 +2278,7 @@ H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
 
     /* Flush cached raw data for each kind of dataset layout */
     if(dataset->shared->layout.ops->flush && 
-            (dataset->shared->layout.ops->flush)(dataset, dxpl_id, flags) < 0)
+            (dataset->shared->layout.ops->flush)(dataset, dxpl_id, closing) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to flush raw data")
 
 done:
@@ -2319,7 +2319,7 @@ H5D_flush_cb(void *_dataset, hid_t UNUSED id, void *_udata)
     /* Check for dataset in same file */
     if(udata->f == dataset->oloc.file) {
         /* Flush the dataset's information */
-        if(H5D_flush_real(dataset, udata->dxpl_id, udata->flags) < 0)
+        if(H5D_flush_real(dataset, udata->dxpl_id, udata->closing) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, H5_ITER_ERROR, "unable to flush cached dataset info")
     } /* end if */
 
@@ -2342,7 +2342,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5D_flush(const H5F_t *f, hid_t dxpl_id, unsigned flags)
+H5D_flush(const H5F_t *f, hid_t dxpl_id, hbool_t closing)
 {
     H5D_flush_ud_t udata;               /* User data for callback */
     herr_t      ret_value = SUCCEED;    /* Return value */
@@ -2355,7 +2355,7 @@ H5D_flush(const H5F_t *f, hid_t dxpl_id, unsigned flags)
     /* Set user data for callback */
     udata.f = f;
     udata.dxpl_id = dxpl_id;
-    udata.flags = flags;
+    udata.closing = closing;
 
     /* Iterate over all the open datasets */
     H5I_search(H5I_DATASET, H5D_flush_cb, &udata, FALSE);