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

diff --git a/src/H5O.c b/src/H5O.c
index c2ff4f8..1989077 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -28,6 +28,13 @@
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 #define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
 
+/* Interface initialization */
+#define H5_INTERFACE_INIT_FUNC	H5O_init_interface
+
+/* Pablo information */
+/* (Put before include files to avoid problems with inline functions) */
+#define PABLO_MASK	H5O_mask
+
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
@@ -43,8 +50,6 @@
 #include <sys/time.h>
 #endif /* H5_HAVE_GETTIMEOFDAY */
 
-#define PABLO_MASK	H5O_mask
-
 /* PRIVATE PROTOTYPES */
 static herr_t H5O_init(H5F_t *f, hid_t dxpl_id, size_t size_hint,
                        H5G_entry_t *ent/*out*/, haddr_t header);
@@ -96,11 +101,6 @@ static const H5AC_class_t H5AC_OHDR[1] = {{
     (H5AC_clear_func_t)H5O_clear,
 }};
 
-/* Interface initialization */
-static int interface_initialize_g = 0;
-#define INTERFACE_INIT	H5O_init_interface
-static herr_t H5O_init_interface(void);
-
 /* ID to type mapping */
 static const H5O_class_t *const message_type_g[] = {
     H5O_NULL,		/*0x0000 Null					*/