[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, 18 insertions, 4 deletions

diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 37f2d0e..1675c51 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -125,6 +125,7 @@ static herr_t
 H5O_stab_encode(H5F_t *f, uint8_t *p, const void *_mesg)
 {
     const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
+    herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_stab_encode, FAIL);
 
@@ -137,7 +138,8 @@ H5O_stab_encode(H5F_t *f, uint8_t *p, const void *_mesg)
     H5F_addr_encode(f, &p, stab->btree_addr);
     H5F_addr_encode(f, &p, stab->heap_addr);
 
-    FUNC_LEAVE(SUCCEED);
+done:
+    FUNC_LEAVE(ret_value);
 }
 
 
@@ -255,8 +257,15 @@ done:
 static size_t
 H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
 {
+    size_t ret_value;   /* Return value */
+
     FUNC_ENTER_NOAPI(H5O_stab_size, 0);
-    FUNC_LEAVE(2 * H5F_SIZEOF_ADDR(f));
+
+    /* Set return value */
+    ret_value=2 * H5F_SIZEOF_ADDR(f);
+
+done:
+    FUNC_LEAVE(ret_value);
 }
 
 
@@ -277,13 +286,16 @@ H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
 static herr_t
 H5O_stab_free (void *mesg)
 {
+    herr_t ret_value=SUCCEED;   /* Return value */
+
     FUNC_ENTER_NOAPI(H5O_stab_free, FAIL);
 
     assert (mesg);
 
     H5FL_FREE(H5O_stab_t,mesg);
 
-    FUNC_LEAVE (SUCCEED);
+done:
+    FUNC_LEAVE (ret_value);
 }
 
 
@@ -307,6 +319,7 @@ H5O_stab_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
 	       int indent, int fwidth)
 {
     const H5O_stab_t       *stab = (const H5O_stab_t *) _mesg;
+    herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_stab_debug, FAIL);
 
@@ -323,5 +336,6 @@ H5O_stab_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
 	      "Name heap address:", stab->heap_addr);
 
-    FUNC_LEAVE(SUCCEED);
+done:
+    FUNC_LEAVE(ret_value);
 }