[svn-r18862] Description:

	Add 'get_load_size' client callback to determine the image size for
reading a metadata cache entry from the file.

	Remove the 'size' parameter from the H5[A]C_protect() calls.

	General cleanups to align with code on trunk.

Tested on:
        Mac OS X/32 10.6.3 (amazon) in debug mode
        Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

1 files changed, 8 insertions, 2 deletions

diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index fadf416..d3566dc 100755
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -221,9 +221,15 @@ typedef struct {
     hid_t dxpl_id;
 } H5SM_incr_ref_opdata;
 
-/* Callback info for loading a shared message index into the cache */
+/* Callback info for loading a shared message table index into the cache */
+typedef struct H5SM_table_cache_ud_t {
+    H5F_t *f;                   /* File that shared message index stored as a table is in */
+    size_t table_size;          /* Size of SOHM master table in file */
+} H5SM_table_cache_ud_t;
+
+/* Callback info for loading a shared message list index into the cache */
 typedef struct H5SM_list_cache_ud_t {
-    H5F_t *f;  /* File that shared message index stored as a list is in */
+    H5F_t *f;                   /* File that shared message index stored as a table is in */
     H5SM_index_header_t *header; /* Index header for this list */
 } H5SM_list_cache_ud_t;