[svn-r13232] Description:

	Remove the "scaffolding" for shared message method invocation and
simplify the way shared messages are dealt with in general.

Tested on:
	FreeBSD/32 6.2 (duty)
	Mac OS X/32 10.4.8 (amazon)

1 files changed, 13 insertions, 17 deletions

diff --git a/src/H5Olink.c b/src/H5Olink.c
index b77446e..47ebfdb 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -38,17 +38,16 @@
 
 /* PRIVATE PROTOTYPES */
 static void *H5O_link_decode(H5F_t *f, hid_t dxpl_id, unsigned mesg_flags, const uint8_t *p);
-static herr_t H5O_link_encode(H5F_t *f, uint8_t *p, const void *_mesg);
+static herr_t H5O_link_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
 static void *H5O_link_copy(const void *_mesg, void *_dest);
-static size_t H5O_link_size(const H5F_t *f, const void *_mesg);
+static size_t H5O_link_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_link_reset(void *_mesg);
 static herr_t H5O_link_free(void *_mesg);
 /* static herr_t H5O_link_delete(H5F_t *f, hid_t dxpl_id, const void *_mesg, hbool_t adj_link); */
-static herr_t H5O_link_pre_copy_file(H5F_t *file_src, const H5O_msg_class_t *type,
-    const void *mesg_src, hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata);
-static void *H5O_link_copy_file(H5F_t *file_src, const H5O_msg_class_t *mesg_type,
-    void *native_src, H5F_t *file_dst, hid_t dxpl_id, H5O_copy_t *cpy_info,
-    void *udata);
+static herr_t H5O_link_pre_copy_file(H5F_t *file_src, const void *mesg_src,
+    hbool_t *deleted, const H5O_copy_t *cpy_info, void *udata);
+static void *H5O_link_copy_file(H5F_t *file_src, void *native_src,
+    H5F_t *file_dst, hid_t dxpl_id, H5O_copy_t *cpy_info, void *udata);
 static herr_t H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc_t *dst_oloc,
     void *mesg_dst, hid_t dxpl_id, H5O_copy_t *cpy_info);
 static herr_t H5O_link_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg,
@@ -59,6 +58,7 @@ const H5O_msg_class_t H5O_MSG_LINK[1] = {{
     H5O_LINK_ID,            	/*message id number             */
     "link",                 	/*message name for debugging    */
     sizeof(H5O_link_t),     	/*native message size           */
+    FALSE,			/* messages are sharable?       */
     H5O_link_decode,        	/*decode message                */
     H5O_link_encode,        	/*encode message                */
     H5O_link_copy,          	/*copy the native value         */
@@ -67,10 +67,8 @@ const H5O_msg_class_t H5O_MSG_LINK[1] = {{
     H5O_link_free,	        /* free method			*/
     H5O_link_delete,	       	/* file delete method		*/
     NULL,			/* link method			*/
-    NULL,		    	/*get share method		*/
     NULL, 			/*set share method		*/
     NULL,		    	/*can share method		*/
-    NULL, 			/*is shared method		*/
     H5O_link_pre_copy_file,	/* pre copy native value to file */
     H5O_link_copy_file,		/* copy native value to file    */
     H5O_link_post_copy_file,	/* post copy native value to file    */
@@ -232,7 +230,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_link_encode(H5F_t *f, uint8_t *p, const void *_mesg)
+H5O_link_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
     const H5O_link_t       *lnk = (const H5O_link_t *) _mesg;
     size_t                  len;            /* Length of a string in the message */
@@ -381,7 +379,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_link_size(const H5F_t *f, const void *_mesg)
+H5O_link_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
 {
     const H5O_link_t *lnk = (const H5O_link_t *)_mesg;
     size_t ret_value;   /* Return value */
@@ -573,9 +571,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_link_pre_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t UNUSED *type,
-    const void UNUSED *native_src, hbool_t *deleted, const H5O_copy_t *cpy_info,
-    void UNUSED *udata)
+H5O_link_pre_copy_file(H5F_t UNUSED *file_src, const void UNUSED *native_src,
+    hbool_t *deleted, const H5O_copy_t *cpy_info, void UNUSED *udata)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_link_pre_copy_file)
 
@@ -610,9 +607,8 @@ H5O_link_pre_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t UNUSED *typ
  *-------------------------------------------------------------------------
  */
 static void *
-H5O_link_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t UNUSED *mesg_type,
-    void *native_src, H5F_t UNUSED *file_dst, hid_t UNUSED dxpl_id,
-    H5O_copy_t UNUSED *cpy_info, void UNUSED *udata)
+H5O_link_copy_file(H5F_t UNUSED *file_src, void *native_src, H5F_t UNUSED *file_dst,
+    hid_t UNUSED dxpl_id, H5O_copy_t UNUSED *cpy_info, void UNUSED *udata)
 {
     H5O_link_t  *link_src = (H5O_link_t *)native_src;
     H5O_link_t  *link_dst = NULL;