1 files changed, 10 insertions, 22 deletions

diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 8b33884..b47ad3b 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -65,10 +65,6 @@ const H5O_class_t H5O_STAB[1] = {{
     H5O_stab_debug,         	/*debug the message             */
 }};
 
-/* Interface initialization */
-static int interface_initialize_g = 0;
-#define INTERFACE_INIT  NULL
-
 /* Declare a free list to manage the H5O_stab_t struct */
 H5FL_DEFINE_STATIC(H5O_stab_t);
 
@@ -97,7 +93,7 @@ H5O_stab_decode(H5F_t *f, hid_t UNUSED dxpl_id, const uint8_t *p, H5O_shared_t U
     H5O_stab_t          *stab=NULL;
     void                *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_stab_decode, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_stab_decode);
 
     /* check args */
     assert(f);
@@ -142,9 +138,8 @@ 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);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_encode);
 
     /* check args */
     assert(f);
@@ -155,8 +150,7 @@ 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);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -234,7 +228,7 @@ H5O_stab_copy(const void *_mesg, void *_dest)
     H5O_stab_t             *dest = (H5O_stab_t *) _dest;
     void                *ret_value;     /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_stab_copy, NULL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_stab_copy);
 
     /* check args */
     assert(stab);
@@ -276,12 +270,11 @@ H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
 {
     size_t ret_value;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5O_stab_size, 0);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_size);
 
     /* Set return value */
     ret_value=2 * H5F_SIZEOF_ADDR(f);
 
-done:
     FUNC_LEAVE_NOAPI(ret_value);
 }
 
@@ -303,16 +296,13 @@ done:
 static herr_t
 H5O_stab_free (void *mesg)
 {
-    herr_t ret_value=SUCCEED;   /* Return value */
-
-    FUNC_ENTER_NOAPI(H5O_stab_free, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_free);
 
     assert (mesg);
 
     H5FL_FREE(H5O_stab_t,mesg);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -336,7 +326,7 @@ H5O_stab_delete(H5F_t *f, hid_t dxpl_id, 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_delete, FAIL);
+    FUNC_ENTER_NOAPI_NOINIT(H5O_stab_delete);
 
     /* check args */
     assert(f);
@@ -371,9 +361,8 @@ H5O_stab_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
 	       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);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_debug);
 
     /* check args */
     assert(f);
@@ -388,6 +377,5 @@ H5O_stab_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
 	      "Name heap address:", stab->heap_addr);
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }