[svn-r15171] Description:

	Convert the symbol table node metadata cache client to use the new
journaling cache callbacks.

	Also added a 'H5F_t *' parameter to the 'serialize' callback for the
journaling cache, which makes the client's job much easier.

	Various minor coding cleanups, etc. also.

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.3 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 20 insertions, 10 deletions

diff --git a/test/cache2_common.c b/test/cache2_common.c
index b8716f1..0537cf2 100644
--- a/test/cache2_common.c
+++ b/test/cache2_common.c
@@ -1151,7 +1151,8 @@ serialize(haddr_t addr,
 } /* serialize() */
 
 herr_t 
-pico_serialize(haddr_t addr,
+pico_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                size_t len,
                void * image_ptr,
                void * thing,
@@ -1166,7 +1167,8 @@ pico_serialize(haddr_t addr,
 }
 
 herr_t 
-nano_serialize(haddr_t addr,
+nano_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                size_t len,
                void * image_ptr,
                void * thing,
@@ -1181,7 +1183,8 @@ nano_serialize(haddr_t addr,
 }
 
 herr_t 
-micro_serialize(haddr_t addr,
+micro_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                 size_t len,
                 void * image_ptr,
                 void * thing,
@@ -1196,7 +1199,8 @@ micro_serialize(haddr_t addr,
 }
 
 herr_t 
-tiny_serialize(haddr_t addr,
+tiny_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                size_t len,
                void * image_ptr,
                void * thing,
@@ -1211,7 +1215,8 @@ tiny_serialize(haddr_t addr,
 }
 
 herr_t 
-small_serialize(haddr_t addr,
+small_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                 size_t len,
                 void * image_ptr,
                 void * thing,
@@ -1226,7 +1231,8 @@ small_serialize(haddr_t addr,
 }
 
 herr_t 
-medium_serialize(haddr_t addr,
+medium_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                  size_t len,
                  void * image_ptr,
                  void * thing,
@@ -1241,7 +1247,8 @@ medium_serialize(haddr_t addr,
 }
 
 herr_t 
-large_serialize(haddr_t addr,
+large_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                 size_t len,
                 void * image_ptr,
                 void * thing,
@@ -1256,7 +1263,8 @@ large_serialize(haddr_t addr,
 }
 
 herr_t 
-huge_serialize(haddr_t addr,
+huge_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                size_t len,
                void * image_ptr,
                void * thing,
@@ -1271,7 +1279,8 @@ huge_serialize(haddr_t addr,
 }
 
 herr_t 
-monster_serialize(haddr_t addr,
+monster_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                   size_t len,
                   void * image_ptr,
                   void * thing,
@@ -1286,7 +1295,8 @@ monster_serialize(haddr_t addr,
 }
 
 herr_t 
-variable_serialize(haddr_t addr,
+variable_serialize(const H5F_t UNUSED *f,
+               haddr_t addr,
                    size_t len,
                    void * image_ptr,
                    void * thing,