[svn-r18032] Description:

	Bring r18031 from trunk to 1.8 branch:

	Bring r18030 from merge_metadata_journaling branch to trunk:

	Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.

	Also, some other minor cleanups along the way.

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
	(h5committested on trunk)

1 files changed, 1 insertions, 1 deletions

diff --git a/src/H5FO.c b/src/H5FO.c
index 6982e36..bbc3b7d 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -320,7 +320,7 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
 
     /* Get the object node from the container */
     if(NULL != (open_obj = (H5FO_open_obj_t *)H5SL_search(f->shared->open_objs, &addr)))
-        ret_value = (htri_t)open_obj->deleted;
+        ret_value = open_obj->deleted;
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_marked() */