[svn-r17553] Description:

	Bring general fixes/improvements from file_free_space branch back to
trunk.

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 (jam) 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, 3 insertions, 3 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 830cdd7..d259db4 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1084,7 +1084,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
             HDONE_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close property list")
 
         /* Only truncate the file on an orderly close, with write-access */
-        if(f->closing && (H5F_ACC_RDWR & f->shared->flags)) {
+        if(f->closing && (H5F_ACC_RDWR & H5F_INTENT(f))) {
             /* Truncate the file to the current allocated size */
             if(H5FD_truncate(f->shared->lf, dxpl_id, (unsigned)TRUE) < 0)
                 /* Push error, but keep going*/
@@ -1616,7 +1616,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
      * calling H5Fflush() with the read-only handle, still causes data
      * to be flushed.
      */
-    if(H5F_ACC_RDWR & f->shared->flags) {
+    if(H5F_ACC_RDWR & H5F_INTENT(f)) {
         /* Flush other files, depending on scope */
         if(H5F_SCOPE_GLOBAL == scope) {
             /* Call the flush routine for mounted file hierarchies */
@@ -1894,7 +1894,7 @@ H5F_try_close(H5F_t *f)
      * copy of the cache needs to be clean.
      * Only try to flush the file if it was opened with write access.
      */
-    if(f->intent&H5F_ACC_RDWR) {
+    if(f->intent & H5F_ACC_RDWR) {
         /* Flush all caches */
         if(H5F_flush(f, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")