[svn-r7917] Purpose:

    Code cleanup

Description:
    Clean up compiler warnings, especially the 'FUNC' variable not used which
comes out in production mode.

Solution:
    Had to add a new FUNC_ENTER_NOAPI_NOINIT_NOFUNC macro for those non-API
functions which don't need the 'FUNC' variable defined.  (This will be _so_
much easier when C99 is standard on all our supposed platforms, since it has a
__FUNC__ macro... )

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    too minor for h5committest (although there were lots of files changed, the
        change was minor in each one)

1 files changed, 8 insertions, 8 deletions

diff --git a/src/H5B.c b/src/H5B.c
index 1d24ded..87e04ac 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -568,7 +568,7 @@ done:
 static herr_t
 H5B_dest(H5F_t UNUSED *f, H5B_t *bt)
 {
-    FUNC_ENTER_NOINIT(H5B_dest)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_dest)
 
     /*
      * Check arguments.
@@ -609,7 +609,7 @@ H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy)
     unsigned	u;      /* Local index variable */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOINIT(H5B_clear)
+    FUNC_ENTER_NOAPI_NOINIT(H5B_clear)
 
     /*
      * Check arguments.
@@ -650,7 +650,7 @@ H5B_size(H5F_t *f, H5B_t *bt)
 {
     size_t      ret_value = 0;
 
-    FUNC_ENTER_NOINIT(H5B_size)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_size)
 
     /* check args */
     assert(f);
@@ -804,7 +804,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, H5B_t *old_bt, haddr
     unsigned	u;                      /* Local index variable */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOINIT(H5B_split)
+    FUNC_ENTER_NOAPI_NOINIT(H5B_split)
 
     /*
      * Check arguments.
@@ -954,7 +954,7 @@ H5B_decode_key(H5F_t *f, H5B_t *bt, unsigned idx)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5B_decode_key)
+    FUNC_ENTER_NOAPI_NOINIT(H5B_decode_key)
 
     assert(bt->key[idx].dirty==0);
 
@@ -986,7 +986,7 @@ H5B_decode_keys(H5F_t *f, H5B_t *bt, unsigned idx)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOINIT(H5B_decode_keys)
+    FUNC_ENTER_NOAPI_NOINIT(H5B_decode_keys)
 
     assert(f);
     assert(bt);
@@ -1231,7 +1231,7 @@ H5B_insert_child(const H5F_t *f, const H5B_class_t *type, H5B_t *bt,
     size_t	recsize;
     unsigned	u;              /* Local index variable */
 
-    FUNC_ENTER_NOINIT(H5B_insert_child)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_insert_child)
 
     assert(bt);
     assert(bt->nchildren<2*H5F_KVALUE(f, type));
@@ -1364,7 +1364,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
     H5B_ins_t	my_ins = H5B_INS_ERROR;
     H5B_ins_t	ret_value = H5B_INS_ERROR;      /* Return value */
 
-    FUNC_ENTER_NOINIT(H5B_insert_helper)
+    FUNC_ENTER_NOAPI_NOINIT(H5B_insert_helper)
 
     /*
      * Check arguments