[svn-r7918] 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, 4 insertions, 4 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index 41661af..3cb9b2d 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -197,7 +197,7 @@ H5AC_init_interface(void)
 #endif /* H5_HAVE_PARALLEL */
     herr_t ret_value=SUCCEED;           /* Return value */
 
-    FUNC_ENTER_NOINIT(H5AC_init_interface);
+    FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface);
 
     /* Sanity check */
     assert(H5P_CLS_DATASET_XFER_g!=(-1));
@@ -305,7 +305,7 @@ H5AC_term_interface(void)
 {
     int		n=0;
 
-    FUNC_ENTER_NOINIT(H5AC_term_interface);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface);
 
     if (interface_initialize_g) {
         if(H5AC_dxpl_id>0 || H5AC_noblock_dxpl_id>0 || H5AC_ind_dxpl_id>0) {
@@ -708,8 +708,8 @@ H5AC_compare(const void *_a, const void *_b)
     H5AC_info_t           *slot_a;
     H5AC_info_t           *slot_b;
 
-    /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
-    FUNC_ENTER_NOINIT(H5AC_compare);
+    /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_compare);
 
     assert(current_cache_g);