[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, 24 insertions, 3 deletions

diff --git a/src/H5FDfphdf5.c b/src/H5FDfphdf5.c
index 950fa3f..f3ae364 100644
--- a/src/H5FDfphdf5.c
+++ b/src/H5FDfphdf5.c
@@ -12,6 +12,9 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
+/* Interface initialization */
+#define H5_INTERFACE_INIT_FUNC	H5FD_fphdf5_init_interface
+
 /* Pablo information */
 /* (Put before include files to avoid problems with inline functions) */
 #define PABLO_MASK          H5FD_fphdf5_mask
@@ -116,9 +119,27 @@ const H5FD_class_mpi_t H5FD_fphdf5_g = {
     H5FD_fphdf5_barrier_communicator            /*get_comm              */
 };
 
-/* Interface initialization */
-#define INTERFACE_INIT      H5FD_fphdf5_init
-static int interface_initialize_g = 0;
+
+/*--------------------------------------------------------------------------
+NAME
+   H5FD_fphdf5_init_interface -- Initialize interface-specific information
+USAGE
+    herr_t H5FD_fphdf5_init_interface()
+   
+RETURNS
+    Non-negative on success/Negative on failure
+DESCRIPTION
+    Initializes any interface-specific data or routines.  (Just calls
+    H5FD_fphdf5_init currently).
+
+--------------------------------------------------------------------------*/
+static herr_t
+H5FD_fphdf5_init_interface(void)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_fphdf5_init_interface)
+
+    FUNC_LEAVE_NOAPI(H5FD_fphdf5_init())
+} /* H5FD_fphdf5_init_interface() */
 
 
 /*-------------------------------------------------------------------------