[svn-r8731] Purpose:

    Code cleanup & minor optimization

Description:
    Re-work the way interface initialization routines are specified in the
library to avoid the overhead of checking for them in routines where there is
no interface initialization routine.  This cleans up warnings with gcc 3.4,
reduces the library binary size a bit (about 2-3%) and should speedup the
library's execution slightly.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/gcc34
    h5committest

1 files changed, 2 insertions, 8 deletions

diff --git a/src/H5FO.c b/src/H5FO.c
index 9d973ac..7cb5508 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -32,10 +32,6 @@
 #include "H5FOprivate.h"        /* File objects                         */
 #include "H5Oprivate.h"		/* Object headers		  	*/
 
-/* Interface initialization */
-static int		interface_initialize_g = 0;
-#define INTERFACE_INIT	NULL
-
 /* Private typedefs */
 
 /* Information about object objects in a file */
@@ -115,7 +111,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
     H5FO_open_obj_t *open_obj;  /* Information about open object */
     hid_t ret_value;            /* Return value */
 
-    FUNC_ENTER_NOAPI(H5FO_opened,FAIL)
+    FUNC_ENTER_NOAPI_NOFUNC(H5FO_opened)
 
     /* Sanity check */
     assert(f);
@@ -133,7 +129,6 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
     else
         ret_value=FAIL;
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_opened() */
 
@@ -276,7 +271,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr)
     H5FO_open_obj_t *open_obj;  /* Information about open object */
     herr_t ret_value=SUCCEED;            /* Return value */
 
-    FUNC_ENTER_NOAPI(H5FO_mark,FAIL)
+    FUNC_ENTER_NOAPI_NOFUNC(H5FO_mark)
 
     /* Sanity check */
     assert(f);
@@ -293,7 +288,6 @@ H5FO_mark(const H5F_t *f, haddr_t addr)
     else
         ret_value=FAIL;
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FO_mark() */