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

diff --git a/src/H5A.c b/src/H5A.c
index 113e2a6..21c3390 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -15,6 +15,9 @@
 #define H5A_PACKAGE		/*suppress error about including H5Apkg	*/
 #define H5S_PACKAGE		/*suppress error about including H5Spkg	*/
 
+/* Interface initialization */
+#define H5_INTERFACE_INIT_FUNC	H5A_init_interface
+
 /* Pablo information */
 /* (Put before include files to avoid problems with inline functions) */
 #define PABLO_MASK	H5A_mask
@@ -27,11 +30,6 @@
 #include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Spkg.h"		/* Dataspace functions			*/
 
-/* Is the interface initialized? */
-static int		interface_initialize_g = 0;
-#define INTERFACE_INIT	H5A_init_interface
-static herr_t		H5A_init_interface(void);
-
 /* PRIVATE PROTOTYPES */
 static hid_t H5A_create(const H5G_entry_t *ent, const char *name,
 			const H5T_t *type, const H5S_t *space, hid_t dxpl_id);
@@ -99,12 +97,12 @@ H5A_term_interface(void)
 
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_term_interface)
     
-    if (interface_initialize_g) {
+    if (H5_interface_initialize_g) {
 	if ((n=H5I_nmembers(H5I_ATTR))) {
 	    H5I_clear_type(H5I_ATTR, FALSE);
 	} else {
 	    H5I_dec_type_ref(H5I_ATTR);
-	    interface_initialize_g = 0;
+	    H5_interface_initialize_g = 0;
 	    n = 1;
 	}
     }