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

diff --git a/src/H5B.c b/src/H5B.c
index 59068eb..353a831 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -679,7 +679,7 @@ H5B_split(H5F_t *f, const H5B_class_t *type, H5B_t *old_bt, haddr_t old_addr,
     int	i, k, nleft, nright;
     size_t	recsize = 0;
 
-    FUNC_ENTER(H5B_split, FAIL);
+    FUNC_ENTER_NOINIT(H5B_split);
 
     /*
      * Check arguments.
@@ -834,7 +834,7 @@ H5B_split(H5F_t *f, const H5B_class_t *type, H5B_t *old_bt, haddr_t old_addr,
 static herr_t
 H5B_decode_key(H5F_t *f, H5B_t *bt, int idx)
 {
-    FUNC_ENTER(H5B_decode_key, FAIL);
+    FUNC_ENTER_NOINIT(H5B_decode_key);
 
     bt->key[idx].nkey = bt->native + idx * bt->type->sizeof_nkey;
     if ((bt->type->decode) (f, bt, bt->key[idx].rkey,
@@ -862,7 +862,7 @@ H5B_decode_key(H5F_t *f, H5B_t *bt, int idx)
 static herr_t
 H5B_decode_keys(H5F_t *f, H5B_t *bt, int idx)
 {
-    FUNC_ENTER(H5B_decode_keys, FAIL);
+    FUNC_ENTER_NOINIT(H5B_decode_keys);
 
     assert(f);
     assert(bt);
@@ -1084,7 +1084,8 @@ H5B_insert_child(H5F_t *f, const H5B_class_t *type, H5B_t *bt,
     size_t	recsize;
     int	i;
 
-    FUNC_ENTER(H5B_insert_child, FAIL);
+    FUNC_ENTER_NOINIT(H5B_insert_child);
+
     assert(bt);
     assert(bt->nchildren<2*H5B_Kvalue(f, type));
 
@@ -1214,7 +1215,7 @@ H5B_insert_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type,
     H5B_ins_t	my_ins = H5B_INS_ERROR;
     H5B_ins_t	ret_value = H5B_INS_ERROR;
 
-    FUNC_ENTER(H5B_insert_helper, H5B_INS_ERROR);
+    FUNC_ENTER_NOINIT(H5B_insert_helper);
 
     /*
      * Check arguments