[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, 19 insertions, 26 deletions

diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 6146df8..f378611 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -37,8 +37,8 @@
 
 /* PRIVATE PROTOTYPES */
 static void *H5O_cont_decode(H5F_t *f, hid_t dxpl_id, unsigned mesg_flags, const uint8_t *p);
-static herr_t H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg);
-static size_t H5O_cont_size(const H5F_t *f, const void *_mesg);
+static herr_t H5O_cont_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg);
+static size_t H5O_cont_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg);
 static herr_t H5O_cont_free(void *mesg);
 static herr_t H5O_cont_delete(H5F_t *f, hid_t dxpl_id, const void *_mesg, hbool_t adj_link);
 static herr_t H5O_cont_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream,
@@ -49,6 +49,7 @@ const H5O_msg_class_t H5O_MSG_CONT[1] = {{
     H5O_CONT_ID,            	/*message id number             */
     "hdr continuation",     	/*message name for debugging    */
     sizeof(H5O_cont_t),     	/*native message size           */
+    FALSE,			/* messages are sharable?       */
     H5O_cont_decode,        	/*decode message                */
     H5O_cont_encode,        	/*encode message                */
     NULL,                   	/*no copy method                */
@@ -57,10 +58,8 @@ const H5O_msg_class_t H5O_MSG_CONT[1] = {{
     H5O_cont_free,	        /* free method			*/
     H5O_cont_delete,		/* file delete method		*/
     NULL,			/* link method			*/
-    NULL, 		    	/*get share method		*/
-    NULL,		    	/*can share method		*/
     NULL,		    	/*set share method		*/
-    NULL, 			/*is shared method		*/
+    NULL,		    	/*can share method		*/
     NULL,			/* pre copy native value to file */
     NULL,			/* copy native value to file    */
     NULL, 		 	/* post copy native value to file    */
@@ -129,12 +128,10 @@ done:
  *              matzke@llnl.gov
  *              Aug  7 1997
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
+H5O_cont_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void *_mesg)
 {
     const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
 
@@ -170,12 +167,10 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
  *              koziol@ncsa.uiuc.edu
  *              Sep  6 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_cont_size(const H5F_t *f, const void UNUSED *_mesg)
+H5O_cont_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *_mesg)
 {
     size_t ret_value;   /* Return value */
 
@@ -199,20 +194,18 @@ H5O_cont_size(const H5F_t *f, const void UNUSED *_mesg)
  * Programmer:	Quincey Koziol
  *              Monday, November 15, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_cont_free (void *mesg)
+H5O_cont_free(void *mesg)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_free);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_free)
 
-    assert (mesg);
+    HDassert(mesg);
 
-    H5FL_FREE(H5O_cont_t,mesg);
+    H5FL_FREE(H5O_cont_t, mesg);
 
-    FUNC_LEAVE_NOAPI(SUCCEED);
+    FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_cont_free() */
 
 
@@ -270,14 +263,14 @@ H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
 {
     const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_debug);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_debug)
 
     /* check args */
-    assert(f);
-    assert(cont);
-    assert(stream);
-    assert(indent >= 0);
-    assert(fwidth >= 0);
+    HDassert(f);
+    HDassert(cont);
+    HDassert(stream);
+    HDassert(indent >= 0);
+    HDassert(fwidth >= 0);
 
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
 	      "Continuation address:", cont->addr);
@@ -289,5 +282,5 @@ H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
 	      "Points to chunk number:",
 	      (int) (cont->chunkno));
 
-    FUNC_LEAVE_NOAPI(SUCCEED);
-}
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5O_cont_debug() */