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

diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index bd2ca96..246e486 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -202,12 +202,18 @@ H5FL_DEFINE_STATIC(H5FD_sec2_t);
 hid_t
 H5FD_sec2_init(void)
 {
+    hid_t ret_value=H5FD_SEC2_g;        /* Return value */
+
     FUNC_ENTER_NOAPI(H5FD_sec2_init, FAIL);
 
     if (H5I_VFL!=H5I_get_type(H5FD_SEC2_g))
         H5FD_SEC2_g = H5FDregister(&H5FD_sec2_g);
 
-    FUNC_LEAVE(H5FD_SEC2_g);
+    /* Set return value */
+    ret_value=H5FD_SEC2_g;
+
+done:
+    FUNC_LEAVE(ret_value);
 }
 
 
@@ -455,6 +461,7 @@ H5FD_sec2_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
         *flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
     }
 
+done:
     FUNC_LEAVE(ret_value);
 }
 
@@ -481,10 +488,15 @@ static haddr_t
 H5FD_sec2_get_eoa(H5FD_t *_file)
 {
     H5FD_sec2_t	*file = (H5FD_sec2_t*)_file;
+    haddr_t ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(H5FD_sec2_get_eoa, HADDR_UNDEF);
 
-    FUNC_LEAVE(file->eoa);
+    /* Set return value */
+    ret_value=file->eoa;
+
+done:
+    FUNC_LEAVE(ret_value);
 }
 
 
@@ -510,12 +522,14 @@ static herr_t
 H5FD_sec2_set_eoa(H5FD_t *_file, haddr_t addr)
 {
     H5FD_sec2_t	*file = (H5FD_sec2_t*)_file;
+    herr_t ret_value=SUCCEED;   /* Return value */
 
     FUNC_ENTER_NOAPI(H5FD_sec2_set_eoa, FAIL);
 
     file->eoa = addr;
 
-    FUNC_LEAVE(SUCCEED);
+done:
+    FUNC_LEAVE(ret_value);
 }
 
 
@@ -543,10 +557,15 @@ static haddr_t
 H5FD_sec2_get_eof(H5FD_t *_file)
 {
     H5FD_sec2_t	*file = (H5FD_sec2_t*)_file;
+    haddr_t ret_value;  /* Return value */
 
     FUNC_ENTER_NOAPI(H5FD_get_get_eof, HADDR_UNDEF);
 
-    FUNC_LEAVE(MAX(file->eof, file->eoa));
+    /* Set return value */
+    ret_value=MAX(file->eof, file->eoa);
+
+done:
+    FUNC_LEAVE(ret_value);
 }