[svn-r18031] Description:

	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
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                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 debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.2 (amazon) in debug mode
        Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 4 insertions, 6 deletions

diff --git a/src/H5S.c b/src/H5S.c
index 2d1b9db..170c49c 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -19,7 +19,6 @@
 #define H5_INTERFACE_INIT_FUNC	H5S_init_interface
 
 
-#define _H5S_IN_H5S_C
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fprivate.h"		/* Files				*/
@@ -1466,7 +1465,7 @@ H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
     FUNC_ENTER_NOAPI_NOINIT(H5S_encode)
 
     /* Allocate "fake" file structure */
-    if(NULL == (f = H5F_fake_alloc((size_t)0)))
+    if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
 	HGOTO_ERROR(H5E_DATASPACE, H5E_CANTALLOC, FAIL, "can't allocate fake file struct")
 
     /* Find out the size of buffer needed for extent */
@@ -1577,7 +1576,7 @@ H5S_decode(const unsigned char *buf)
     H5S_extent_t *extent;
     size_t      extent_size;            /* size of the extent message*/
     H5F_t       *f = NULL;              /* Fake file structure*/
-    size_t      sizeof_size;            /* 'Size of sizes' for file */
+    uint8_t     sizeof_size;            /* 'Size of sizes' for file */
     H5S_t       *ret_value;
 
     FUNC_ENTER_NOAPI_NOINIT(H5S_decode)
@@ -1858,9 +1857,9 @@ done:
 hbool_t
 H5S_has_extent(const H5S_t *ds)
 {
-    htri_t ret_value;
+    hbool_t ret_value;
 
-    FUNC_ENTER_NOAPI(H5S_has_extent, FAIL)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_has_extent)
 
     HDassert(ds);
 
@@ -1869,7 +1868,6 @@ H5S_has_extent(const H5S_t *ds)
     else
         ret_value = TRUE;
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5S_has_extent() */