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

diff --git a/src/H5T.c b/src/H5T.c
index 474768f..de6461c 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -21,6 +21,9 @@
 
 #define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
 
+/* Interface initialization */
+#define H5_INTERFACE_INIT_FUNC	H5T_init_interface
+
 /* Pablo information */
 /* (Put before include files to avoid problems with inline functions) */
 #define PABLO_MASK	H5T_mask
@@ -40,10 +43,6 @@
 #include <sys/fpu.h>
 #endif /* H5_HAVE_SYS_FPU_H */
 
-/* Interface initialization */
-static int interface_initialize_g = 0;
-#define INTERFACE_INIT H5T_init_interface
-
 /*
  * Predefined data types. These are initialized at runtime in H5Tinit.c and
  * by H5T_init_interface() in this source file.
@@ -471,11 +470,11 @@ H5T_init(void)
 {
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5T_init, FAIL);
+    FUNC_ENTER_NOAPI(H5T_init,FAIL);
     /* FUNC_ENTER() does all the work */
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(SUCCEED);
 }
 
 
@@ -1263,7 +1262,7 @@ H5T_term_interface(void)
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_term_interface);
 
-    if (interface_initialize_g) {
+    if (H5_interface_initialize_g) {
 	/* Unregister all conversion functions */
 	for (i=0; i<H5T_g.npaths; i++) {
 	    path = H5T_g.path[i];
@@ -1398,7 +1397,7 @@ H5T_term_interface(void)
         H5T_NATIVE_UINT_FAST64_g		= FAIL;
 
 	/* Mark interface as closed */
-	interface_initialize_g = 0;
+	H5_interface_initialize_g = 0;
 	n = 1; /*H5I*/
     }
     FUNC_LEAVE_NOAPI(n);