[svn-r15840] Description:

	Convert local heap cache client to use metadata journaling cache.

	Other minor cleanups & simplifications, etc.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (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/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.2 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 7 insertions, 7 deletions

diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 6f4cf45..4b45c1b 100755
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -60,12 +60,12 @@
 
 /* Metadata cache callbacks */
 static void *H5HG_deserialize(haddr_t addr, size_t len, const void *image, 
-    const void *udata, hbool_t *dirty);
+    void *udata, hbool_t *dirty);
+static herr_t H5HG_image_len(const void *thing, size_t *image_len_ptr);
 static herr_t H5HG_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t len,
     void *image, void *thing, unsigned *flags, haddr_t *new_addr,
     size_t *new_len, void **new_image);
 static herr_t H5HG_free_icr(haddr_t addr, size_t len, void *thing);
-static herr_t H5HG_image_len(const void *thing, size_t *image_len_ptr);
 
 /*********************/
 /* Package Variables */
@@ -122,16 +122,16 @@ const H5AC2_class_t H5AC2_GHEAP[1] = {{
  */
 static void *
 H5HG_deserialize(haddr_t addr, size_t UNUSED len, const void *image,
-    const void *_udata, hbool_t UNUSED *dirty)
+    void *_udata, hbool_t UNUSED *dirty)
 {
 
     H5HG_heap_t	*heap = NULL;
-    uint8_t	*p = NULL;
-    int	i;
+    H5F_t *f = (H5F_t *)_udata;
+    uint8_t	*p;
     size_t	nalloc, need;
     size_t      max_idx=0;              /* The maximum index seen */
-    H5HG_heap_t	*ret_value = NULL;      /* Return value */
-    H5F_t *f = (H5F_t *)_udata;
+    int	i;
+    H5HG_heap_t	*ret_value;             /* Return value */
 
     FUNC_ENTER_NOAPI(H5HG_deserialize, NULL);