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

diff --git a/src/H5O.c b/src/H5O.c
index 1dd1d8a..1634123 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -117,7 +117,7 @@ H5FL_EXTERN(time_t);
 static herr_t
 H5O_init_interface(void)
 {
-    FUNC_ENTER(H5O_init_interface, FAIL);
+    FUNC_ENTER_NOINIT(H5O_init_interface);
 
     /*
      * Initialize functions that decode messages from symbol table entries.
@@ -1148,7 +1148,7 @@ H5O_find_in_ohdr(H5F_t *f, haddr_t addr, const H5O_class_t **type_p,
     unsigned		u;
     const H5O_class_t	*type = NULL;
 
-    FUNC_ENTER(H5O_find_in_ohdr, UFAIL);
+    FUNC_ENTER_NOINIT(H5O_find_in_ohdr);
 
     /* Check args */
     assert(f);
@@ -1411,7 +1411,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
     time_t	now = HDtime(NULL);
     size_t	size;
     
-    FUNC_ENTER(H5O_touch_oh, FAIL);
+    FUNC_ENTER_NOINIT(H5O_touch_oh);
     assert(oh);
 
     /* Look for existing message */
@@ -1657,7 +1657,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size)
     size_t	aligned_size = H5O_ALIGN(size);
     uint8_t	*old_addr;
 
-    FUNC_ENTER(H5O_alloc_extend_chunk, UFAIL);
+    FUNC_ENTER_NOINIT(H5O_alloc_extend_chunk);
 
     /* check args */
     assert(oh);
@@ -1793,7 +1793,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size)
     int	chunkno;
     unsigned	u;
 
-    FUNC_ENTER(H5O_alloc_new_chunk, UFAIL);
+    FUNC_ENTER_NOINIT(H5O_alloc_new_chunk);
 
     /* check args */
     assert (oh);
@@ -1978,7 +1978,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size)
     unsigned	null_idx;
     size_t	aligned_size = H5O_ALIGN(size);
 
-    FUNC_ENTER(H5O_alloc, UFAIL);
+    FUNC_ENTER_NOINIT(H5O_alloc);
 
     /* check args */
     assert (oh);