[svn-r5867] Purpose:

    Code cleanup

Description:
    Changed the last HRETURN* statements in the FUNC_ENTER macros into HGOTO*
    macros, which reduces the size of the library binary in certain
    configurations by another 10%

Platforms tested:
    FreeBSD 4.6 (sleipnir) serial & parallel, IRIX64 6.5 (modi4) serial &
    parallel

1 files changed, 6 insertions, 2 deletions

diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 95e9ff9..ba6ab5f 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -114,6 +114,7 @@ static herr_t
 H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
 {
     const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
+    herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_cont_encode, FAIL);
 
@@ -126,7 +127,8 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
     H5F_addr_encode(f, &p, cont->addr);
     H5F_ENCODE_LENGTH(f, p, cont->size);
 
-    FUNC_LEAVE(SUCCEED);
+done:
+    FUNC_LEAVE(ret_value);
 }
 
 
@@ -150,6 +152,7 @@ H5O_cont_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
 	       int indent, int fwidth)
 {
     const H5O_cont_t       *cont = (const H5O_cont_t *) _mesg;
+    herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_cont_debug, FAIL);
 
@@ -170,5 +173,6 @@ H5O_cont_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
 	      "Points to chunk number:",
 	      (int) (cont->chunkno));
 
-    FUNC_LEAVE(SUCCEED);
+done:
+    FUNC_LEAVE(ret_value);
 }