[svn-r5467] Purpose:

    Code cleanup.

Description:
    Took Robb's recent ideas for improving the FUNC_ENTER/FUNC_LEAVE macros
    equivalents in the SAF library and adapted them to our library.  I added
    an additional macro which is equivalent to FUNC_ENTER:
        FUNC_ENTER_NOINIT - Has the API tracing code, etc. from FUNC_ENTER but
            none of the library or interface initialization code.  This is to
            be used _only_ for static functions and those which explicitly
            cannot have the library or interface initialization code enabled
            (like the API termination routines, etc.).

    This allowed many more of the functions in the library [but not all yet :-(]
    to be wrapped with FUNC_ENTER[_NOINIT]/FUNC_LEAVE pairs.

    It also reduced the size of the library and executables (by cutting out a
    bunch of code which was never executed), I'll e-mail the exact results when
    I've finished editing it.

Platforms tested:
    IRIX64 6.5 (modi4)

1 files changed, 9 insertions, 7 deletions

diff --git a/src/H5A.c b/src/H5A.c
index 45abb48..2f666a9 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -60,7 +60,7 @@ DESCRIPTION
 static herr_t
 H5A_init_interface(void)
 {
-    FUNC_ENTER(H5A_init_interface, FAIL);
+    FUNC_ENTER_NOINIT(H5A_init_interface);
 
     /*
      * Create attribute group.
@@ -95,6 +95,8 @@ int
 H5A_term_interface(void)
 {
     int	n=0;
+
+    FUNC_ENTER_NOINIT(H5A_term_interface);
     
     if (interface_initialize_g) {
 	if ((n=H5I_nmembers(H5I_ATTR))) {
@@ -105,7 +107,7 @@ H5A_term_interface(void)
 	    n = 1;
 	}
     }
-    return n;
+    FUNC_LEAVE(n);
 }
 
 
@@ -220,7 +222,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type,
     int	seq=0;
     hid_t	ret_value = FAIL;
 
-    FUNC_ENTER(H5A_create, FAIL);
+    FUNC_ENTER_NOINIT(H5A_create);
 
     /* check args */
     assert(ent);
@@ -320,7 +322,7 @@ H5A_get_index(H5G_entry_t *ent, const char *name)
     H5A_t      	found_attr;
     int		ret_value=FAIL, i;
 
-    FUNC_ENTER(H5A_get_index, FAIL);
+    FUNC_ENTER_NOINIT(H5A_get_index);
 
     assert(ent);
     assert(name);
@@ -495,7 +497,7 @@ H5A_open(H5G_entry_t *ent, unsigned idx)
     H5A_t       *attr = NULL;
     hid_t	    ret_value = FAIL;
 
-    FUNC_ENTER(H5A_open, FAIL);
+    FUNC_ENTER_NOINIT(H5A_open);
 
     /* check args */
     assert(ent);
@@ -613,7 +615,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf)
     int         idx;	      /* index of attribute in object header */
     herr_t		ret_value = FAIL;
 
-    FUNC_ENTER(H5A_write, FAIL);
+    FUNC_ENTER_NOINIT(H5A_write);
 
     assert(attr);
     assert(mem_type);
@@ -766,7 +768,7 @@ H5A_read(H5A_t *attr, const H5T_t *mem_type, void *buf)
     size_t		buf_size;		/* desired buffer size	*/
     herr_t		ret_value = FAIL;
 
-    FUNC_ENTER(H5A_read, FAIL);
+    FUNC_ENTER_NOINIT(H5A_read);
 
     assert(attr);
     assert(mem_type);