[svn-r6496] Purpose:

    Refactoring of Flush Logic

Description:
    The Flushing logic passed in multiple flags to indicate what type of
    flush it was: closing, invalidate, alloc only. This made extending
    the function of the flush logic to handle other flags annoying.

Solution:
    I changed it to be just one bitmasked flag to indicate what type of
    flushing to do. I also added the CLEAR_ONLY flag, which will be used
    in the FPHDF5 stuff.

Platforms tested:
    h5committest doesn't work for me (my environment isn't setup on the
    other machines I guess). I tested it manually:

        Linux parallel & C++
        Sol Fortran
        Modi4 parallel & Fortran.

1 files changed, 25 insertions, 11 deletions

diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 746b40f..522b3bd 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -1,14 +1,16 @@
-/****************************************************************************
- * NCSA HDF                                                                 *
- * Software Development Group                                               *
- * National Center for Supercomputing Applications                          *
- * University of Illinois at Urbana-Champaign                               *
- * 605 E. Springfield, Champaign IL 61820                                   *
- *                                                                          *
- * For conditions of distribution and use, see the accompanying             *
- * hdf/COPYING file.                                                        *
- *                                                                          *
- ****************************************************************************/
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* $Id$ */
 
@@ -26,6 +28,18 @@
 
 typedef struct H5F_t H5F_t;
 
+/*===----------------------------------------------------------------------===
+ *                              Flush Flags
+ *===----------------------------------------------------------------------===
+ *
+ *  Flags passed into the flush routines which indicate what type of
+ *  flush we want to do. They can be ORed together.
+ */
+#define H5_FLUSH_NONE       (0U)        /* No flags specified                       */
+#define H5_FLUSH_INVALIDATE (1U << 0)   /* Invalidate cached data                   */
+#define H5_FLUSH_ALLOC_ONLY (1U << 1)   /* Allocate space for user and super blocks */
+#define H5_FLUSH_CLOSING    (1U << 2)   /* Closing the file                         */
+#define H5_FLUSH_CLEAR_ONLY (1U << 3)   /* Don't write, just clear dirty flags      */
 
 /*
  * Encode and decode macros for file meta-data.